From: Howard Chu <hyc@openldap.org>
Date: Sat, 24 Jun 2006 02:00:31 +0000 (+0000)
Subject: Fix use of generated passwords
X-Git-Tag: OPENLDAP_REL_ENG_2_4_3ALPHA~9^2~81
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=da33140d7ca84344ff84d9fcc991c865b7ff5374;p=openldap

Fix use of generated passwords
---

diff --git a/tests/data/slapd-valsort.conf b/tests/data/slapd-valsort.conf
index 0d6b8c0dc0..52c556dc9d 100644
--- a/tests/data/slapd-valsort.conf
+++ b/tests/data/slapd-valsort.conf
@@ -52,6 +52,6 @@ valsort-attr            ou ou=users,o=valsort weighted
 valsort-attr            employeeType ou=users,o=valsort weighted alpha-ascend
 
 database config
-rootpw @CONFIGPW@
+include configpw.conf
 
 #monitor#database	monitor
diff --git a/tests/run.in b/tests/run.in
index 0ab71e6c4d..966762280a 100644
--- a/tests/run.in
+++ b/tests/run.in
@@ -189,8 +189,8 @@ fi
 # disable LDAP initialization
 LDAPNOINIT=true; export LDAPNOINIT
 
-$SLAPPASSWD -g -n >configpw
-echo "rootpw `$SLAPPASSWD -T configpw`" >configpw.conf
+$SLAPPASSWD -g -n >$CONFIGPWF
+echo "rootpw `$SLAPPASSWD -T $CONFIGPWF`" >configpw.conf
 
 echo "Running ${SCRIPT}..."
 $SCRIPT $*