From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 18 Mar 2005 00:32:27 +0000 (+0000)
Subject: Sync with HEAD
X-Git-Tag: OPENLDAP_REL_ENG_2_3_2BETA~3
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8671fa7b6cb381c8ab542f0c37af40ac4f40d978;p=openldap

Sync with HEAD
---

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index e83f6c737b..d8d8870409 100644
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -2586,7 +2586,7 @@ config_setup_ldif( BackendDB *be, const char *dir ) {
 
 	cfb->cb_db.bd_info = backend_info( "ldif" );
 	if ( !cfb->cb_db.bd_info )
-		return 1;
+		return 0;	/* FIXME: eventually this will be a fatal error */
 
 	if ( cfb->cb_db.bd_info->bi_db_init( &cfb->cb_db )) return 1;
 
diff --git a/servers/slapd/passwd.c b/servers/slapd/passwd.c
index a262a9911a..265681c4a4 100644
--- a/servers/slapd/passwd.c
+++ b/servers/slapd/passwd.c
@@ -415,33 +415,37 @@ slap_passwd_check(
 	struct berval		*bv;
 	AccessControlState	acl_state = ACL_STATE_INIT;
 
-#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
-	ldap_pvt_thread_mutex_lock( &passwd_mutex );
-#ifdef SLAPD_SPASSWD
-	lutil_passwd_sasl_conn = op->o_conn->c_sasl_authctx;
-#endif
-#endif
-
 	for ( bv = a->a_vals; bv->bv_val != NULL; bv++ ) {
+		int	rc;
+
 		/* if e is provided, check access */
 		if ( e && access_allowed( op, e, a->a_desc, bv,
 					ACL_AUTH, &acl_state ) == 0 )
 		{
 			continue;
 		}
-		
-		if ( !lutil_passwd( bv, cred, NULL, text ) ) {
-			result = 0;
-			break;
-		}
-	}
 
 #if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
+		ldap_pvt_thread_mutex_lock( &passwd_mutex );
 #ifdef SLAPD_SPASSWD
-	lutil_passwd_sasl_conn = NULL;
+		lutil_passwd_sasl_conn = op->o_conn->c_sasl_authctx;
 #endif
-	ldap_pvt_thread_mutex_unlock( &passwd_mutex );
 #endif
+	
+		rc = lutil_passwd( bv, cred, NULL, text );
+
+#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
+#ifdef SLAPD_SPASSWD
+		lutil_passwd_sasl_conn = NULL;
+#endif
+		ldap_pvt_thread_mutex_unlock( &passwd_mutex );
+#endif
+
+		if ( !rc ) {
+			result = 0;
+			break;
+		}
+	}
 
 	return result;
 }
diff --git a/tests/data/slapd-translucent-local.conf b/tests/data/slapd-translucent-local.conf
index 8f9db68801..8185df803e 100644
--- a/tests/data/slapd-translucent-local.conf
+++ b/tests/data/slapd-translucent-local.conf
@@ -24,9 +24,10 @@ include ./schema/nis.schema
 pidfile     ./testrun/slapd.2.pid
 argsfile    ./testrun/slapd.2.args
 
-#mod#modulepath	../servers/slapd/back-@BACKEND@/:../servers/slapd/back-ldap/:../servers/slapd/overlays
+#mod#modulepath	../servers/slapd/back-@BACKEND@
 #mod#moduleload	back_@BACKEND@.la
-#mod#moduleload back_ldap.la
+#ldapmod#modulepath ../servers/slapd/back-ldap
+#ldapmod#moduleload back_ldap.la
 #translucentmod#modulepath	../servers/slapd/overlays
 #translucentmod#moduleload	translucent.la