X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=tests%2Fscripts%2Ftest000-rootdse;h=1264e08d156e432a4be63d93def64c7f6b6cac07;hb=1880c23029f01704a90e9ddd847b779b2f271edf;hp=47ddc2abe52eeed5c35e7773ced001fa7d6d2235;hpb=6c6b4d2895276fba926821d09dd9fe5a125adcad;p=openldap

diff --git a/tests/scripts/test000-rootdse b/tests/scripts/test000-rootdse
index 47ddc2abe5..1264e08d15 100755
--- a/tests/scripts/test000-rootdse
+++ b/tests/scripts/test000-rootdse
@@ -1,17 +1,21 @@
 #! /bin/sh
 # $OpenLDAP$
 
-if test $# -eq 0 ; then
-	SRCDIR="."
-else
+SRCDIR="."
+if test $# -ge 1 ; then
 	SRCDIR=$1; shift
 fi
-if test $# -eq 1 ; then
+BACKEND=bdb
+if test $# -ge 1 ; then
 	BACKEND=$1; shift
 fi
 
-echo "running defines.sh $SRCDIR $BACKEND"
+WAIT=0
+if test $# -ge 1 ; then
+	WAIT=1; shift
+fi
 
+echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
 
 echo "Datadir is $DATADIR"
@@ -21,12 +25,17 @@ echo "Cleaning up in $DBDIR..."
 rm -f $DBDIR/[!C]*
 
 echo "Starting slapd on TCP/IP port $PORT..."
-$SLAPD -f $CONF -h $MASTERURI -d $LVL $TIMING > $MASTERLOG 2>&1 &
+. $CONFFILTER $BACKEND < $SCHEMACONF > $DBCONF
+$SLAPD -f $DBCONF -h $MASTERURI -d $LVL $TIMING > $MASTERLOG 2>&1 &
 PID=$!
+if test $WAIT != 0 ; then
+    echo PID $PID
+    read foo
+fi
 
 echo "Using ldapsearch to retrieve all the entries..."
 for i in 0 1 2 3 4 5; do
-	$LDAPSEARCH -b "" -s base -h localhost:$PORT '+' > $SEARCHOUT 2>&1
+	$LDAPSEARCH -b "" -s base -h $LOCALHOST -p $PORT 'extensibleObject' > $SEARCHOUT 2>&1
 	RC=$?
 	if test $RC = 1 ; then
 		echo "Waiting 5 seconds for slapd to start..."
@@ -41,7 +50,11 @@ cat $SEARCHOUT
 if test $RC != 0 ; then
 	echo ">>>>> Test failed"
 else
-	echo ">>>>> Test succeeded"
+	if grep "TLS:" $SEARCHOUT; then
+		RC=-1
+	else
+	    echo ">>>>> Test succeeded"
+	fi
 fi