From: Howard Chu <hyc@openldap.org>
Date: Sat, 19 Aug 2006 06:27:11 +0000 (+0000)
Subject: Fix prev commit
X-Git-Tag: OPENLDAP_REL_ENG_2_4_3ALPHA~2^2~3
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d7be822a2a501b4045feae488ae464f64317d9b4;p=openldap

Fix prev commit
---

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index 7e8dca9508..fecc892846 100644
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -528,7 +528,8 @@ void slapd_remove(
 
 	SLAP_DEL_SOCK(s);
 
-	ber_sockbuf_free(sb);
+	if ( sb )
+		ber_sockbuf_free(sb);
 
 	/* If we ran out of file descriptors, we dropped a listener from
 	 * the select() loop. Now that we're removing a session from our
@@ -1265,7 +1266,7 @@ close_listeners(
 		Listener *lr = slap_listeners[l];
 
 		if ( lr->sl_sd != AC_SOCKET_INVALID ) {
-			if ( remove ) slapd_remove( lr->sl_sd, 0, 0, 0 );
+			if ( remove ) slapd_remove( lr->sl_sd, NULL, 0, 0, 0 );
 
 #ifdef LDAP_PF_LOCAL
 			if ( lr->sl_sa.sa_addr.sa_family == AF_LOCAL ) {