Fix SPASSWD mutex bug

diff --git a/CHANGES b/CHANGES
index 0cd63d276fd13ebe70adb0a7ad1963d5d7e38e4c..79167fdc53f90309d165e92cc4351a763c4a0b09 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
 OpenLDAP 2.0 Change Log
 
 OpenLDAP 2.0.X Engineering
+       Fixed slapd spasswd mutex bug
        Updated -lldap SASL error reporting
        Updated -lldap TLS error reporting
        Build Environment

diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index 20856cf7a167cc1a9c60b365ce6fafe2d089447d..bbd12cad5a4211389fdadbba2df029362ee12049 100644 (file)
--- a/servers/slapd/backend.c
+++ b/servers/slapd/backend.c
@@ -513,7 +513,7 @@ be_isroot_pw( Backend *be,
                return 0;
        }
 
-#if defined( SLAPD_CRYPT ) || defined( SLAPD_PASSWD )
+#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
        ldap_pvt_thread_mutex_lock( &passwd_mutex );
 #ifdef SLAPD_SPASSWD
        lutil_passwd_sasl_conn = conn->c_sasl_context;
@@ -522,7 +522,7 @@ be_isroot_pw( Backend *be,
 
        result = lutil_passwd( &be->be_root_pw, cred, NULL );
 
-#if defined( SLAPD_CRYPT ) || defined( SLAPD_PASSWD )
+#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
 #ifdef SLAPD_SPASSWD
        lutil_passwd_sasl_conn = NULL;
 #endif

diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index 69f64d4b7a32f8feb02e8267215c83178376c003..fe57be4c20099434feb9d221c868bd4efae6f53c 100644 (file)
--- a/servers/slapd/init.c
+++ b/servers/slapd/init.c
@@ -40,7 +40,7 @@ char          **g_argv;
  */
 ldap_pvt_thread_pool_t connection_pool;
 ldap_pvt_thread_mutex_t        gmtime_mutex;
-#if defined( SLAPD_CRYPT ) || defined( SLAPD_PASSWD )
+#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
 ldap_pvt_thread_mutex_t        passwd_mutex;
 #endif
 
@@ -103,7 +103,7 @@ slap_init( int mode, const char *name )
                        ldap_pvt_thread_mutex_init( &num_sent_mutex );
 
                        ldap_pvt_thread_mutex_init( &gmtime_mutex );
-#if defined( SLAPD_CRYPT ) || defined( SLAPD_PASSWD )
+#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
                        ldap_pvt_thread_mutex_init( &passwd_mutex );
 #endif
 

diff --git a/servers/slapd/passwd.c b/servers/slapd/passwd.c
index 381fb088fdcba8e72708bc615121af1d6c582353..79dbe4340d2dd7b06aece8dc7ab274e32f8504a0 100644 (file)
--- a/servers/slapd/passwd.c
+++ b/servers/slapd/passwd.c
@@ -1,4 +1,4 @@
-/* bind.c - ldbm backend bind and unbind routines */
+/* passwd.c - passwd routines */
 /* $OpenLDAP$ */
 /*
  * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
@@ -224,7 +224,7 @@ slap_passwd_check(
        int     i;
        int result = 1;
 
-#if defined( SLAPD_CRYPT ) || defined( SLAPD_PASSWD )
+#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
        ldap_pvt_thread_mutex_lock( &passwd_mutex );
 #ifdef SLAPD_SPASSWD
        lutil_passwd_sasl_conn = conn->c_sasl_context;
@@ -238,7 +238,7 @@ slap_passwd_check(
                }
        }
 
-#if defined( SLAPD_CRYPT ) || defined( SLAPD_PASSWD )
+#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
 #ifdef SLAPD_SPASSWD
        lutil_passwd_sasl_conn = NULL;
 #endif
@@ -266,13 +266,13 @@ struct berval * slap_passwd_hash(
 
        struct berval *new;
 
-#if defined( SLAPD_CRYPT ) || defined( SLAPD_PASSWD )
+#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
        ldap_pvt_thread_mutex_lock( &passwd_mutex );
 #endif
 
        new = lutil_passwd_hash( cred , hash );
        
-#if defined( SLAPD_CRYPT ) || defined( SLAPD_PASSWD )
+#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
        ldap_pvt_thread_mutex_unlock( &passwd_mutex );
 #endif