From 1e68029078a215ae78befcfe94067982b1547df0 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Wed, 24 Apr 2013 00:52:52 -0700 Subject: [PATCH] Drop ldap_int_sasl_mutex 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. --- libraries/libldap/cyrus.c | 4 ---- libraries/libldap/ldap-int.h | 3 --- libraries/libldap/sasl.c | 6 ------ libraries/libldap/util-int.c | 3 --- 4 files changed, 16 deletions(-) diff --git a/libraries/libldap/cyrus.c b/libraries/libldap/cyrus.c index d283cb30f7..28c241b0bf 100644 --- a/libraries/libldap/cyrus.c +++ b/libraries/libldap/cyrus.c @@ -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 #else diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h index d3dd21157e..37c342e260 100644 --- a/libraries/libldap/ldap-int.h +++ b/libraries/libldap/ldap-int.h @@ -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 diff --git a/libraries/libldap/sasl.c b/libraries/libldap/sasl.c index 0c7658cf52..3edde0703c 100644 --- a/libraries/libldap/sasl.c +++ b/libraries/libldap/sasl.c @@ -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; diff --git a/libraries/libldap/util-int.c b/libraries/libldap/util-int.c index 373c81c512..ee9deb24bc 100644 --- a/libraries/libldap/util-int.c +++ b/libraries/libldap/util-int.c @@ -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 -- 2.39.5