upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-05 14:42:10 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix previous commit

Browse source
This commit is contained in:
Pierangelo Masarati 2010-07-26 19:45:36 +00:00
parent c2ab1778a0
commit d27038f6b4
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libraries/libldap/request.c
View file

@ -383,8 +383,9 @@ find_tls_ext( LDAPURLDesc *srv )
}
/*
* caller must hold ld_req_mutex
* if ( connect != 0 ) or ( bind != NULL ) caller must also hold ld_res_mutex
* caller must hold ld_req_mutex or be exclusive user of ld
* if ( connect != 0 ) or ( bind != NULL ) caller must also hold
* ld_req_mutex and ld_res_mutex
*/
LDAPConn *
@ -394,10 +395,6 @@ ldap_new_connection( LDAP *ld, LDAPURLDesc **srvlist, int use_ldsb,
LDAPConn *lc;
int async = 0;
#ifdef LDAP_R_COMPILE
LDAP_PVT_THREAD_ASSERT_MUTEX_OWNER( &ld->ld_req_mutex );
#endif
Debug( LDAP_DEBUG_TRACE, "ldap_new_connection %d %d %d\n",
use_ldsb, connect, (bind != NULL) );
/*
@ -467,6 +464,7 @@ ldap_new_connection( LDAP *ld, LDAPURLDesc **srvlist, int use_ldsb,
if ( connect ) {
#ifdef LDAP_R_COMPILE
LDAP_PVT_THREAD_ASSERT_MUTEX_OWNER( &ld->ld_req_mutex );
LDAP_PVT_THREAD_ASSERT_MUTEX_OWNER( &ld->ld_res_mutex );
#endif
@ -506,6 +504,7 @@ ldap_new_connection( LDAP *ld, LDAPURLDesc **srvlist, int use_ldsb,
LDAPConn *savedefconn;
#ifdef LDAP_R_COMPILE
LDAP_PVT_THREAD_ASSERT_MUTEX_OWNER( &ld->ld_req_mutex );
LDAP_PVT_THREAD_ASSERT_MUTEX_OWNER( &ld->ld_res_mutex );
#endif