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.

diff --git a/libraries/libldap/cyrus.c b/libraries/libldap/cyrus.c
index d283cb30f797ca719060ac8d8f8df9f75ed5f934..28c241b0bf47b508ed34b82a9f958467cb1967d0 100644 (file)
--- 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 <sasl/sasl.h>
 #else

diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
index d3dd21157e70e98306fabaa516fa39a63faa2e06..37c342e260f701b53182bbe238bf74b69c1012e6 100644 (file)
--- 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 0c7658cf5291e166b2f8644d309c3caecce9483a..3edde0703ccf7967506499253a6c1869902d64b0 100644 (file)
--- 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 373c81c5129a3b3bd802e7cb26730bfd10d8e484..ee9deb24bc09b003e4d0a40c6aa8cbba55ec49ac 100644 (file)
--- 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