mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Drop ldap_int_sasl_mutex

Browse Source 
It was introduced for Cyrus 1.5 in 2001; we've been on 2.x since 2002 and
Cyrus does its own locking when needed.
This commit is contained in:
Howard Chu 2013-04-24 00:52:52 -07:00
parent 9381d04b87
commit 1e68029078
4 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/libldap/cyrus.c
View File

@ -41,10 +41,6 @@
#define INT_MAX 2147483647 /* 32 bit signed max */
#endif
#ifdef LDAP_R_COMPILE
ldap_pvt_thread_mutex_t ldap_int_sasl_mutex;
#endif
#ifdef HAVE_SASL_SASL_H
#include <sasl/sasl.h>
#else

3
libraries/libldap/ldap-int.h
View File

@ -493,9 +493,6 @@ struct ldap {
LDAP_V ( ldap_pvt_thread_mutex_t ) ldap_int_resolv_mutex;
LDAP_V ( ldap_pvt_thread_mutex_t ) ldap_int_hostname_mutex;
#ifdef HAVE_CYRUS_SASL
LDAP_V( ldap_pvt_thread_mutex_t ) ldap_int_sasl_mutex;
#endif
#ifdef HAVE_GSSAPI
LDAP_V( ldap_pvt_thread_mutex_t ) ldap_int_gssapi_mutex;
#endif

6
libraries/libldap/sasl.c
View File

@ -426,9 +426,6 @@ ldap_sasl_interactive_bind(
char *smechs = NULL;
int rc;
#if defined( HAVE_CYRUS_SASL )
LDAP_MUTEX_LOCK( &ldap_int_sasl_mutex );
#endif
#ifdef LDAP_CONNECTIONLESS
if( LDAP_IS_UDP(ld) ) {
/* Just force it to simple bind, silly to make the user
@ -476,9 +473,6 @@ ldap_sasl_interactive_bind(
flags, interact, defaults, result, rmech, msgid );
done:
#if defined( HAVE_CYRUS_SASL )
LDAP_MUTEX_UNLOCK( &ldap_int_sasl_mutex );
#endif
if ( smechs ) LDAP_FREE( smechs );
return rc;

3
libraries/libldap/util-int.c
View File

@ -612,9 +612,6 @@ void ldap_int_utils_init( void )
ldap_pvt_thread_mutex_init( &ldap_int_gettime_mutex );
#ifdef HAVE_CYRUS_SASL
ldap_pvt_thread_mutex_init( &ldap_int_sasl_mutex );
#endif
#ifdef HAVE_GSSAPI
ldap_pvt_thread_mutex_init( &ldap_int_gssapi_mutex );
#endif