From a5419366ada4b10b245306e809f5805ba9adacd7 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: May 21 2013 23:30:50 +0000
Subject: Ticket #47359 - new ldap connections can block ldaps and ldapi connections


https://fedorahosted.org/389/ticket/47359
Reviewed by: nhosoi (Thanks!)
Branch: master
Fix Description: Fix more build breakage in previous commit
Platforms tested: RHEL6 x86_64
Flag Day: no
Doc impact: no

---

diff --git a/ldap/servers/slapd/daemon.c b/ldap/servers/slapd/daemon.c
index 56069d0..7791f81 100644
--- a/ldap/servers/slapd/daemon.c
+++ b/ldap/servers/slapd/daemon.c
@@ -140,7 +140,7 @@ void disk_monitoring_stop();
 
 typedef struct listener_info {
 	int idx; /* index of this listener in the ct->fd array */
-	PRFileDesc *listenpr; /* the listener fd */
+	PRFileDesc *listenfd; /* the listener fd */
 	int secure;
 	int local;
 } listener_info;
@@ -966,7 +966,6 @@ void slapd_daemon( daemon_ports_t *ports )
 	int s_tcps_native = 0;
 	PRFileDesc *s_tcps = NULL; 
 #else
-	PRFileDesc *tcps = 0;
 	PRFileDesc **n_tcps = NULL; 
 	PRFileDesc **s_tcps = NULL; 
 	PRFileDesc **i_unix = NULL;
@@ -1169,9 +1168,6 @@ void slapd_daemon( daemon_ports_t *ports )
 		int			oserr;
 #endif
 		int select_return = 0;
-		int secure = 0; /* is a new connection an SSL one ? */
-		int local = 0; /* is new connection an ldapi one? */
-		int i;
 
 #ifndef _WIN32
 		PRErrorCode prerr;