Happy New Year

[openldap] / tests / scripts / passwd-search

diff --git a/tests/scripts/passwd-search b/tests/scripts/passwd-search
index 8c7ca24abb7d4d9545ec0c1def74eaf24dd21cbf..a2ab328298221b7ee7e24955e125468053edd0c9 100755 (executable)
--- a/tests/scripts/passwd-search
+++ b/tests/scripts/passwd-search
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2005 The OpenLDAP Foundation.
+## Copyright 1998-2013 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -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