mirror of
https://git.openldap.org/openldap/openldap.git
synced 2024-12-21 03:10:25 +08:00
Remove c_sasl_bindmutex, Binds are already serialized.
This commit is contained in:
parent
09e64b6fe8
commit
9f5b28baf3
@ -232,7 +232,6 @@ do_bind(
|
||||
}
|
||||
|
||||
/* Set the bindop for the benefit of in-directory SASL lookups */
|
||||
ldap_pvt_thread_mutex_lock( &conn->c_sasl_bindmutex );
|
||||
conn->c_sasl_bindop = op;
|
||||
|
||||
if ( method == LDAP_AUTH_SASL ) {
|
||||
@ -574,10 +573,7 @@ do_bind(
|
||||
}
|
||||
|
||||
cleanup:
|
||||
if( conn->c_sasl_bindop != NULL ) {
|
||||
conn->c_sasl_bindop = NULL;
|
||||
ldap_pvt_thread_mutex_unlock( &conn->c_sasl_bindmutex );
|
||||
}
|
||||
conn->c_sasl_bindop = NULL;
|
||||
|
||||
if( pdn.bv_val != NULL ) {
|
||||
free( pdn.bv_val );
|
||||
|
@ -139,7 +139,6 @@ int connections_destroy(void)
|
||||
ber_sockbuf_free( connections[i].c_sb );
|
||||
ldap_pvt_thread_mutex_destroy( &connections[i].c_mutex );
|
||||
ldap_pvt_thread_mutex_destroy( &connections[i].c_write_mutex );
|
||||
ldap_pvt_thread_mutex_destroy( &connections[i].c_sasl_bindmutex );
|
||||
ldap_pvt_thread_cond_destroy( &connections[i].c_write_cv );
|
||||
}
|
||||
}
|
||||
@ -451,7 +450,6 @@ long connection_init(
|
||||
/* should check status of thread calls */
|
||||
ldap_pvt_thread_mutex_init( &c->c_mutex );
|
||||
ldap_pvt_thread_mutex_init( &c->c_write_mutex );
|
||||
ldap_pvt_thread_mutex_init( &c->c_sasl_bindmutex );
|
||||
ldap_pvt_thread_cond_init( &c->c_write_cv );
|
||||
|
||||
c->c_struct_state = SLAP_C_UNUSED;
|
||||
|
@ -1620,7 +1620,6 @@ typedef struct slap_conn {
|
||||
void *c_sasl_context; /* SASL session context */
|
||||
void *c_sasl_extra; /* SASL session extra stuff */
|
||||
struct slap_op *c_sasl_bindop; /* set to current op if it's a bind */
|
||||
ldap_pvt_thread_mutex_t c_sasl_bindmutex; /* lock for bindop */
|
||||
|
||||
PagedResultsState c_pagedresults_state; /* paged result state */
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user