Fix use of generated passwords

diff --git a/tests/data/slapd-valsort.conf b/tests/data/slapd-valsort.conf
index 0d6b8c0dc068abad4fe8fd0eb25d0c43ef5c44ce..52c556dc9d7b14aec30882a376741aa8f568d5dc 100644 (file)
--- 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 0ab71e6c4d8de555b23737fe70238f65b74fe8d1..966762280ac5eb4c7c21d2fc3028ba0435371404 100644 (file)
--- 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 $*