From 4722f67fbdf767f1afa3aa0772b75c8bd881cd16 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Fri, 21 May 2004 19:29:34 +0000 Subject: [PATCH] ITS#3123 make sure ldap_int_sasl_mutex is init'd before it is used --- CHANGES | 1 + libraries/libldap/cyrus.c | 2 -- libraries/libldap/util-int.c | 4 ++++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 90c719f037..68c5ca20f8 100644 --- 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 2b632482a8..d98b534863 100644 --- 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 dbdc8b298c..8969ebe175 100644 --- 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... */ -- 2.39.5