More ldapbis cleanup

[openldap] / servers / slapd / connection.c

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index ebdac9bcf4da906eb97becaa1997e9adca0dc180..4662f98cebd5be4c03af22fdc0985f9fe527081a 100644 (file)
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -831,8 +831,12 @@ void connection_closing( Connection *c, const char *why )
                /* wake write blocked operations */
                if ( c->c_writewaiter ) {
                        ldap_pvt_thread_cond_signal( &c->c_write_cv );
-                       ldap_pvt_thread_mutex_unlock( &c->c_mutex );
+                       /* ITS#4667 this may allow another thread to drop into
+                        * connection_resched / connection_close before we
+                        * finish, but that's OK.
+                        */
                        slapd_clr_write( sd, 1 );
+                       ldap_pvt_thread_mutex_unlock( &c->c_mutex );
                        ldap_pvt_thread_mutex_lock( &c->c_write_mutex );
                        ldap_pvt_thread_mutex_lock( &c->c_mutex );
                        ldap_pvt_thread_mutex_unlock( &c->c_write_mutex );
@@ -854,10 +858,12 @@ connection_close( Connection *c )
        assert( connections != NULL );
        assert( c != NULL );
 
-       if ( c->c_conn_state != SLAP_C_CLOSING )
+       /* ITS#4667 we may have gotten here twice */
+       if ( c->c_conn_state == SLAP_C_INVALID )
                return;
 
        assert( c->c_struct_state == SLAP_C_USED );
+       assert( c->c_conn_state == SLAP_C_CLOSING );
 
        /* NOTE: c_mutex should be locked by caller */