upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-09 08:23:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup connection locking

Browse source
This commit is contained in:
Pierangelo Masarati 2005-04-21 00:49:35 +00:00
parent 90b46ed931
commit 471f4772a0
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
servers/slapd/back-ldap/bind.c
View file

@ -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