ITS#5489

diff --git a/CHANGES b/CHANGES
index 3af472e719e8fe7acfade9374031fd6f9f06ad94..46b00eb6654b4f0c398321b053148c5a31c677d1 100644 (file)
--- 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 3fe81157b79552017523151a9b107583eb7aa14d..45bd7d3fe801afd8a33cad32a46c09c51e1793c4 100644 (file)
--- 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--;
        }