ITS#3123 make sure ldap_int_sasl_mutex is init'd before it is used

diff --git a/CHANGES b/CHANGES
index 90c719f037edd48d0e8dc5bd0ba526d8ef979987..68c5ca20f809b662108d9b8494ae5279e734c506 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -13,6 +13,7 @@ OpenLDAP 2.2.12 Engineering
        Fixed back-ldap normalization bug 
        Fixed pcache cache_entries init bug (ITS#3150)
        Fixed pcache consistency_check bug (ITS#3151)
+       Fixed libldap SASL mutex init bug (ITS#3123)
        Fixed libldap SASL buffering bug (ITS#3139)
        Build Environment
                Fixed liblber memory debug portability bug (ITS#3116)

diff --git a/libraries/libldap/cyrus.c b/libraries/libldap/cyrus.c
index 2b632482a8ad05f259dbcdfd3648862d55391fee..d98b534863e7272ab4cf2a457597e753db1ef9f9 100644 (file)
--- a/libraries/libldap/cyrus.c
+++ b/libraries/libldap/cyrus.c
@@ -114,8 +114,6 @@ int ldap_int_sasl_init( void )
                ldap_pvt_sasl_mutex_lock,
                ldap_pvt_sasl_mutex_unlock,    
                ldap_pvt_sasl_mutex_dispose );    
-
-       ldap_pvt_thread_mutex_init( &ldap_int_sasl_mutex );
 #endif
 
        if ( sasl_client_init( NULL ) == SASL_OK ) {

diff --git a/libraries/libldap/util-int.c b/libraries/libldap/util-int.c
index dbdc8b298c54cce5c61b5f1da6a11536e3e2e4da..8969ebe175a17b0ef23b8c11e90c13d7db1185f4 100644 (file)
--- a/libraries/libldap/util-int.c
+++ b/libraries/libldap/util-int.c
@@ -399,6 +399,10 @@ void ldap_int_utils_init( void )
        ldap_pvt_thread_mutex_init( &ldap_int_ctime_mutex );
 #endif
        ldap_pvt_thread_mutex_init( &ldap_int_resolv_mutex );
+
+#ifdef HAVE_CYRUS_SASL
+       ldap_pvt_thread_mutex_init( &ldap_int_sasl_mutex );
+#endif
 #endif
 
        /* call other module init functions here... */