From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Mon, 7 Jul 2008 18:57:18 +0000 (+0000)
Subject: ITS#5489
X-Git-Tag: OPENLDAP_REL_ENG_2_3_43~4
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;ds=sidebyside;h=8696d47b7468769e8c090d4807dce0ba671be8ab;p=openldap

ITS#5489
---

diff --git a/CHANGES b/CHANGES
index 4e35844d48..dc8baff994 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,7 @@ OpenLDAP 2.3 Change Log
 OpenLDAP 2.3.43 Engineering
 	Fixed liblber ber_get_next length decoding (ITS#5580)
 	Fixed slapd replog timestamps (ITS#5532)
+	Fixed slapd socket assert (ITS#5489)
 
 OpenLDAP 2.3.42 Release (2008/05/28)
 	Fixed libldap file descriptor leak with SELinux (ITS#5507)
diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index eb582ef708..d893407a64 100644
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -810,9 +810,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--;
 	}