More ldapbis cleanup

[openldap] / servers / slapd / connection.c

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index 3643713cc8d31096f2147b491c3493f0c2194830..4662f98cebd5be4c03af22fdc0985f9fe527081a 100644 (file)
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -835,8 +835,8 @@ void connection_closing( Connection *c, const char *why )
                         * connection_resched / connection_close before we
                         * finish, but that's OK.
                         */
-                       ldap_pvt_thread_mutex_unlock( &c->c_mutex );
                        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 );
@@ -863,7 +863,7 @@ connection_close( Connection *c )
                return;
 
        assert( c->c_struct_state == SLAP_C_USED );
-       assert( c->c_struct_state == SLAP_C_CLOSING );
+       assert( c->c_conn_state == SLAP_C_CLOSING );
 
        /* NOTE: c_mutex should be locked by caller */