From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 27 May 2008 22:12:44 +0000 (+0000)
Subject: ITS#5489
X-Git-Tag: OPENLDAP_REL_ENG_2_4_10~22
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=74bb8575f1016faa7f2fed76f04e877682fb61c2;p=openldap

ITS#5489
---

diff --git a/CHANGES b/CHANGES
index 3af472e719..46b00eb665 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@ OpenLDAP 2.4.10 Engineering
 	Fixed libldap_r missing stubs (ITS#5519)
 	Fixed slapd missing termination of integerFilter keys (ITS#5503)
 	Fixed slapd multiple attrs in URI (ITS#5516)
+	Fixed slapd socket assert (ITS#5489)
 	Fixed slapd-bdb/hdb MAXPATHLEN (ITS#5531)
 	Fixed slapd-ldap entry_get() op-dependent behavior (ITS#5513)
 	Fixed slapd-meta quarantine crasher (ITS#5522)
diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index 3fe81157b7..45bd7d3fe8 100644
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -928,9 +928,9 @@ slapd_clr_write( ber_socket_t s, int wake )
 {
 	ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex );
 
-	assert( SLAP_SOCK_IS_ACTIVE( s ));
-
 	if ( SLAP_SOCK_IS_WRITE( s )) {
+		assert( SLAP_SOCK_IS_ACTIVE( s ));
+
 		SLAP_SOCK_CLR_WRITE( s );
 		slap_daemon.sd_nwriters--;
 	}