ITS#9991 send_ldap_ber: make sure we're only closing our own connection

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index a50f66498eec9944d7a903dcd892ba6c9964b4ef..1e21cdefba62c0b1c5754a5ab1c3c9a1b76a449e 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -398,7 +398,9 @@ fail:
                        conn->c_writing = 0;
                        ldap_pvt_thread_mutex_unlock( &conn->c_write1_mutex );
                        ldap_pvt_thread_mutex_lock( &conn->c_mutex );
-                       connection_closing( conn, close_reason );
+                       /* conn may have been reused by the time we get the mutex */
+                       if ( op->o_connid == conn->c_connid )
+                               connection_closing( conn, close_reason );
                        ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
                        return -1;
                }