Pick up last remaining changes

[openldap] / tests / scripts / test015-xsearch

diff --git a/tests/scripts/test015-xsearch b/tests/scripts/test015-xsearch
index 5f101d61b30f55b7af228ec48bfeadf799c892c0..0adb6ebbdd17ef398aa61acb213316488914a102 100755 (executable)
--- a/tests/scripts/test015-xsearch
+++ b/tests/scripts/test015-xsearch
@@ -161,18 +161,18 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-#FILTER="(:rdnMatch:=cn=All Staff)"
-#echo "        f=$FILTER ..."
-#echo "#         f=$FILTER ..." >> $SEARCHOUT
-#$LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
-#      "$FILTER" >> $SEARCHOUT 2>&1
-#
-#RC=$?
-#if test $RC != 0 ; then
-#      echo "ldapsearch failed ($RC)!"
-#      test $KILLSERVERS != no && kill -HUP $KILLPIDS
-#      exit $RC
-#fi
+FILTER="(name:dn:=whatever)"
+echo "        f=$FILTER ..."
+echo "#         f=$FILTER ..." >> $SEARCHOUT
+$LDAPSEARCH -S "" -b "" -s base -h $LOCALHOST -p $PORT1 \
+       "$FILTER" >> $SEARCHOUT 2>&1
+
+RC=$?
+if test $RC != 0 ; then
+       echo "ldapsearch failed ($RC)!"
+       test $KILLSERVERS != no && kill -HUP $KILLPIDS
+       exit $RC
+fi
 
 echo "Testing values return filter searching:"
 echo "# Testing values return filter searching:" >> $SEARCHOUT