From: Pierangelo Masarati <ando@openldap.org>
Date: Thu, 21 Apr 2005 00:49:35 +0000 (+0000)
Subject: cleanup connection locking
X-Git-Tag: OPENLDAP_AC_BP~861
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=471f4772a0332b9efa6a0dae69919b36365fcf44;p=openldap

cleanup connection locking
---

diff --git a/servers/slapd/back-ldap/bind.c b/servers/slapd/back-ldap/bind.c
index 12d9e6d147..e53e7b5b3f 100644
--- a/servers/slapd/back-ldap/bind.c
+++ b/servers/slapd/back-ldap/bind.c
@@ -471,7 +471,6 @@ ldap_back_dobind_int(
 
 	assert( retries >= 0 );
 
-	ldap_pvt_thread_mutex_lock( &lc->lc_mutex );
 	if ( !lc->lc_bound ) {
 		struct ldapinfo	*li = (struct ldapinfo *)op->o_bd->be_private;
 
@@ -585,14 +584,19 @@ retry:;
 
 done:;
 	rc = lc->lc_bound;
-	ldap_pvt_thread_mutex_unlock( &lc->lc_mutex );
 	return rc;
 }
 
 int
 ldap_back_dobind( struct ldapconn *lc, Operation *op, SlapReply *rs, ldap_back_send_t sendok )
 {
-	return ldap_back_dobind_int( lc, op, rs, sendok, 1 );
+	int	rc;
+
+	ldap_pvt_thread_mutex_lock( &lc->lc_mutex );
+	rc = ldap_back_dobind_int( lc, op, rs, sendok, 1 );
+	ldap_pvt_thread_mutex_unlock( &lc->lc_mutex );
+
+	return rc;
 }
 
 /*
@@ -705,18 +709,21 @@ retry:;
 int
 ldap_back_retry( struct ldapconn *lc, Operation *op, SlapReply *rs, ldap_back_send_t sendok )
 {
+	int	rc;
+
 	ldap_pvt_thread_mutex_lock( &lc->lc_mutex );
 	ldap_unbind_ext_s( lc->lc_ld, NULL, NULL );
 	lc->lc_ld = NULL;
 	lc->lc_bound = 0;
 
 	/* lc here must be the regular lc, reset and ready for init */
-	if ( ldap_back_prepare_conn( &lc, op, rs, sendok ) != LDAP_SUCCESS ) {
-		return 0;
+	rc = ldap_back_prepare_conn( &lc, op, rs, sendok );
+	if ( rc == LDAP_SUCCESS ) {
+		rc = ldap_back_dobind_int( lc, op, rs, sendok, 0 );
 	}
-
 	ldap_pvt_thread_mutex_unlock( &lc->lc_mutex );
-	return ldap_back_dobind_int( lc, op, rs, sendok, 0 );
+
+	return rc;
 }
 
 static int