add new ber dump routine (behind NEW_LOGGING)

[openldap] / servers / slapd / passwd.c

diff --git a/servers/slapd/passwd.c b/servers/slapd/passwd.c
index 547fb44c221b936a1cbbde76d458645347431e57..63110da27139c33830be51c5fdc79db42bb7c1ed 100644 (file)
--- a/servers/slapd/passwd.c
+++ b/servers/slapd/passwd.c
@@ -217,28 +217,35 @@ struct berval * slap_passwd_return(
 
 int
 slap_passwd_check(
+       Connection *conn,
        Attribute *a,
        struct berval *cred )
 {
        int     i;
-       for ( i = 0; a->a_vals[i] != NULL; i++ ) {
-               int result;
+       int result = 1;
 
-#ifdef SLAPD_CRYPT
-               ldap_pvt_thread_mutex_lock( &crypt_mutex );
+#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;
 #endif
-
-               result = lutil_passwd( a->a_vals[i], cred, NULL );
-
-#ifdef SLAPD_CRYPT
-               ldap_pvt_thread_mutex_unlock( &crypt_mutex );
 #endif
 
-               if( !result )
-                       return result;
+       for ( i = 0; a->a_vals[i] != NULL; i++ ) {
+               if( !lutil_passwd( a->a_vals[i], cred, NULL ) ) {
+                       result = 0;
+                       break;
+               }
        }
 
-       return( 1 );
+#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
+#ifdef SLAPD_SPASSWD
+       lutil_passwd_sasl_conn = NULL;
+#endif
+       ldap_pvt_thread_mutex_unlock( &passwd_mutex );
+#endif
+
+       return result;
 }
 
 struct berval * slap_passwd_generate( void )
@@ -259,14 +266,14 @@ struct berval * slap_passwd_hash(
 
        struct berval *new;
 
-#ifdef SLAPD_CRYPT
-       ldap_pvt_thread_mutex_lock( &crypt_mutex );
+#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
+       ldap_pvt_thread_mutex_lock( &passwd_mutex );
 #endif
 
        new = lutil_passwd_hash( cred , hash );
        
-#ifdef SLAPD_CRYPT
-       ldap_pvt_thread_mutex_unlock( &crypt_mutex );
+#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
+       ldap_pvt_thread_mutex_unlock( &passwd_mutex );
 #endif
 
        return new;