Fix use of generated password

diff --git a/tests/scripts/conf.sh b/tests/scripts/conf.sh
index c16ea0bb6800c483f0f0c31c155c45a07ab62496..7bef25a2a58305ba24b092cf063e056a5f98ebb6 100755 (executable)
--- a/tests/scripts/conf.sh
+++ b/tests/scripts/conf.sh
@@ -69,7 +69,6 @@ sed -e "s/@BACKEND@/${BACKEND}/"                      \
        -e "s;@PORT4@;${PORT4};"                        \
        -e "s;@PORT5@;${PORT5};"                        \
        -e "s;@PORT6@;${PORT6};"                        \
-       -e "s/@CONFIGPW@/${CONFIGPW}/"          \
        -e "s/@SASL_MECH@/${SASL_MECH}/"                \
        -e "s/@CACHETTL@/${CACHETTL}/"                  \
        -e "s/@ENTRY_LIMIT@/${CACHE_ENTRY_LIMIT}/"      \

diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh
index 35d4f672df63feace034be36b27bf1db97b7692d..7a2a21235aaef52c2c2718bc83f63426b96f40c3 100755 (executable)
--- a/tests/scripts/defines.sh
+++ b/tests/scripts/defines.sh
@@ -142,7 +142,7 @@ LOG6=$TESTDIR/slapd.6.log
 SLAPADDLOG1=$TESTDIR/slapadd.1.log
 SLURPLOG=$TESTDIR/slurp.log
 
-CONFIGPWF=$TESTDIR/configpw
+CONFIGPWF=./configpw
 
 # args
 TOOLARGS="-x $LDAP_TOOLARGS"

diff --git a/tests/scripts/test034-translucent b/tests/scripts/test034-translucent
index 822704492c7eeb6c8d65fad73385a29c9c815fed..4337b32a6684c26ae4bac4c064baf56c70dad030 100755 (executable)
--- a/tests/scripts/test034-translucent
+++ b/tests/scripts/test034-translucent
@@ -15,7 +15,6 @@
 
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
-PASSWD=`cat configpw`
 LVL=-1
 PERSONAL="(objectClass=inetOrgPerson)"
 NOWHERE="/dev/null"
@@ -200,7 +199,7 @@ fi
 
 echo "Dynamically configuring local slapd without translucent_no_glue..."
 
-$LDAPMODIFY -D "$TRANSLUCENTROOT" -H $URI2 -w $PASSWD <<EOF
+$LDAPMODIFY -D cn=config -H $URI2 -y $CONFIGPWF <<EOF
 dn: olcOverlay={0}translucent,olcDatabase={2}bdb,cn=config
 changetype: modify
 replace: olcTranslucentNoGlue
@@ -601,7 +600,7 @@ fi
 
 echo "Dynamically configuring local slapd with translucent_no_glue and translucent_string..."
 
-$LDAPMODIFY -D "$TRANSLUCENTROOT" -H $URI2 -w $PASSWD <<EOF
+$LDAPMODIFY -D cn=config -H $URI2 -y $CONFIGPWF <<EOF
 dn: olcOverlay={0}translucent,olcDatabase={2}bdb,cn=config
 changetype: modify
 replace: olcTranslucentNoGlue

diff --git a/tests/scripts/test042-valsort b/tests/scripts/test042-valsort
index 1e633e0c0859ad2042f35312ffacb15f6b75fd26..a8f5a64fdf6f726563e8792a66beddc582ce2480 100755 (executable)
--- a/tests/scripts/test042-valsort
+++ b/tests/scripts/test042-valsort
@@ -23,14 +23,6 @@ fi
 
 mkdir -p $TESTDIR $DBDIR1
 
-$SLAPPASSWD -g -n > $CONFIGPWF
-RC=$?
-if test $RC != 0 ; then
-       echo "slappasswd failed ($RC)!"
-       exit $RC
-fi
-read CONFIGPW < $CONFIGPWF
-
 echo "Running slapadd to build slapd database..."
 . $CONFFILTER $BACKEND $MONITORDB < $VALSORTCONF > $CONF1
 $SLAPADD -f $CONF1 -l $LDIFVALSORT