From: Howard Chu <hyc@openldap.org>
Date: Wed, 30 Dec 2009 20:33:27 +0000 (+0000)
Subject: ITS#6322 cleanup close_listeners()
X-Git-Tag: MIGRATION_CVS2GIT~732
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7946c100a482c5ca1aaa8e28c7178cac64bb61c0;p=openldap

ITS#6322 cleanup close_listeners()
---

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index 1acc659712..1d000c14f7 100644
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -1720,9 +1720,12 @@ close_listeners(
 
 	for ( l = 0; slap_listeners[l] != NULL; l++ ) {
 		Listener *lr = slap_listeners[l];
+		slap_listeners[l] = NULL;
 
 		if ( lr->sl_sd != AC_SOCKET_INVALID ) {
-			if ( remove ) slapd_remove( lr->sl_sd, NULL, 0, 0, 0 );
+			int s = lr->sl_sd;
+			lr->sl_sd = AC_SOCKET_INVALID;
+			if ( remove ) slapd_remove( s, NULL, 0, 0, 0 );
 
 #ifdef LDAP_PF_LOCAL
 			if ( lr->sl_sa.sa_addr.sa_family == AF_LOCAL ) {
@@ -1730,7 +1733,7 @@ close_listeners(
 			}
 #endif /* LDAP_PF_LOCAL */
 
-			slapd_close( lr->sl_sd );
+			slapd_close( s );
 		}
 
 		if ( lr->sl_url.bv_val ) {
@@ -1742,7 +1745,6 @@ close_listeners(
 		}
 
 		free( lr );
-		slap_listeners[l] = NULL;
 	}
 }