resync with HEAD

diff --git a/tests/scripts/passwd-search b/tests/scripts/passwd-search
index 8c7ca24abb7d4d9545ec0c1def74eaf24dd21cbf..bd9f66adf78371ecb5c0befe275a864290efb090 100755 (executable)
--- a/tests/scripts/passwd-search
+++ b/tests/scripts/passwd-search
@@ -27,12 +27,13 @@ echo "running defines.sh $SRCDIR $BACKEND"
 
 if test -d "$TESTDIR"; then
        echo "Cleaning up in $TESTDIR..."
-       /bin/rm -rf testrun/db.*
+       /bin/rm -rf $TESTDIR/db.*
 fi
 mkdir -p $TESTDIR
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $PASSWDCONF -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+. $CONFFILTER $BACKEND $MONITORDB < $PASSWDCONF > $CONF1
+$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
 PID=$!
 if test ${WAIT-0} != 0 ; then
     echo PID $PID