From 4d9d4e2538cd4264db6ad54dd0830c5da3c2dacb Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Thu, 14 Dec 2006 02:12:39 +0000 Subject: [PATCH] Fix connections_shutdown() --- servers/slapd/connection.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c index 86aea6ca17..7a46410ab5 100644 --- a/servers/slapd/connection.c +++ b/servers/slapd/connection.c @@ -196,22 +196,19 @@ int connections_shutdown(void) ber_socket_t i; for ( i = 0; i < dtblsize; i++ ) { - if( connections[i].c_struct_state != SLAP_C_USED ) { - continue; - } - /* give persistent clients a chance to cleanup */ - if( connections[i].c_conn_state == SLAP_C_CLIENT ) { - ldap_pvt_thread_pool_submit( &connection_pool, - connections[i].c_clientfunc, connections[i].c_clientarg ); - continue; - } - ldap_pvt_thread_mutex_lock( &connections[i].c_mutex ); - - /* c_mutex is locked */ - connection_closing( &connections[i], "slapd shutdown" ); - connection_close( &connections[i] ); - + if( connections[i].c_struct_state == SLAP_C_USED ) { + + /* give persistent clients a chance to cleanup */ + if( connections[i].c_conn_state == SLAP_C_CLIENT ) { + ldap_pvt_thread_pool_submit( &connection_pool, + connections[i].c_clientfunc, connections[i].c_clientarg ); + } else { + /* c_mutex is locked */ + connection_closing( &connections[i], "slapd shutdown" ); + connection_close( &connections[i] ); + } + } ldap_pvt_thread_mutex_unlock( &connections[i].c_mutex ); } -- 2.47.2