ITS#5489

diff --git a/CHANGES b/CHANGES
index 4e35844d48f1081ddc83e6b5d3a7f7b64e262cc3..dc8baff994d86b6024e7d9ddf89b82214f830949 100644 (file)
--- 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 eb582ef7083a751ef2228b19c2347bef7a9a7874..d893407a6429f1a8b915fc4d04740696097d5698 100644 (file)
--- 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--;
        }