From: Howard Chu <hyc@openldap.org>
Date: Tue, 17 Oct 2006 19:31:42 +0000 (+0000)
Subject: From rev 1.373, releasing the mutex means connection_close() may get called
X-Git-Tag: OPENLDAP_REL_ENG_2_3_MP~46
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=354e90a0d93911fed788d3740c62c9ca5678cf4c;p=openldap

From rev 1.373, releasing the mutex means connection_close() may get called
from another thread. Drop the assert, just return instead.
---

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index 5311091545..ebdac9bcf4 100644
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -853,8 +853,11 @@ connection_close( Connection *c )
 
 	assert( connections != NULL );
 	assert( c != NULL );
+
+	if ( c->c_conn_state != SLAP_C_CLOSING )
+		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 */