Commit 0b31c94a authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#6361

parent 5bc5ae6b
......@@ -8,6 +8,7 @@ OpenLDAP 2.4.20 Engineering
Fixed libldap uninitialized return value (ITS#6355)
Fixed liblutil constant (ITS#5909)
Added slapd handling of hex server IDs (ITS#6297)
Fixed slapd asserts in minimal environment (ITS#6361)
Fixed slapd configArgs initialization (ITS#6363)
Fixed slapd debug handling of LDAP_DEBUG_ANY (ITS#6324)
Fixed slapd inclusion of ac/unistd.h (ITS#6342)
......
......@@ -783,7 +783,9 @@ void connection_closing( Connection *c, const char *why )
{
assert( connections != NULL );
assert( c != NULL );
assert( c->c_struct_state == SLAP_C_USED );
if ( c->c_struct_state != SLAP_C_USED ) return;
assert( c->c_conn_state != SLAP_C_INVALID );
/* c_mutex must be locked by caller */
......@@ -816,7 +818,9 @@ connection_close( Connection *c )
{
assert( connections != NULL );
assert( c != NULL );
assert( c->c_struct_state == SLAP_C_USED );
if ( c->c_struct_state != SLAP_C_USED ) return;
assert( c->c_conn_state == SLAP_C_CLOSING );
/* NOTE: c_mutex should be locked by caller */
......
......@@ -989,13 +989,17 @@ slapd_clr_read( ber_socket_t s, int wake )
void
slapd_set_read( ber_socket_t s, int wake )
{
int do_wake = 1;
ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex );
assert( SLAP_SOCK_IS_ACTIVE( s ));
if (!SLAP_SOCK_IS_READ( s )) SLAP_SOCK_SET_READ( s );
if( SLAP_SOCK_IS_ACTIVE( s ) && !SLAP_SOCK_IS_READ( s )) {
SLAP_SOCK_SET_READ( s );
} else {
do_wake = 0;
}
ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex );
WAKE_LISTENER(wake);
if ( do_wake )
WAKE_LISTENER(wake);
}
time_t
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment