From cedc315b0dfd4e49f6fea12c3fcc966d8e266ee5 Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 5 Jan 2010 22:56:11 +0000
Subject: [PATCH] cleanup close_listeners on shutdown.
---
servers/slapd/daemon.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
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;
}
}
--
GitLab