--- tests/scripts/test000-rootdse	2005/09/17 20:22:16	1.25
+++ tests/scripts/test000-rootdse	2007/08/31 23:14:09	1.29.2.2
@@ -1,8 +1,8 @@
 #! /bin/sh
-# $OpenLDAP: pkg/ldap/tests/scripts/test000-rootdse,v 1.24 2005/08/20 22:59:34 hallvard Exp $
+# $OpenLDAP: pkg/ldap/tests/scripts/test000-rootdse,v 1.31 2007/01/02 19:01:19 kurt Exp $
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2005 The OpenLDAP Foundation.
+## Copyright 1998-2007 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -16,7 +16,7 @@
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
 
-mkdir -p $TESTRUN $DBDIR1
+mkdir -p $TESTDIR $DBDIR1
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $SCHEMACONF > $CONF1
@@ -28,10 +28,12 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Using ldapsearch to retrieve the root DSE..."
 for i in 0 1 2 3 4 5; do
 	$LDAPSEARCH -b "" -s base -h $LOCALHOST -p $PORT1 \
-		'+extensibleObject' > $SEARCHOUT 2>&1
+		'@extensibleObject' > $SEARCHOUT 2>&1
 	RC=$?
 	if test $RC = 0 ; then
 		break
@@ -55,7 +57,7 @@ if test $RC = 0 ; then
 		count=3
 		echo "Using ldapsearch to retrieve the cn=Monitor..."
 		$LDAPSEARCH -b "cn=Monitor" -s base -h $LOCALHOST -p $PORT1 \
-			'+extensibleObject' >> $SEARCHOUT 2>&1
+			'@monitor' >> $SEARCHOUT 2>&1
 		RC=$?
 		;;
 	esac
@@ -79,4 +81,6 @@ else
 	fi
 fi
 
+test $KILLSERVERS != no && wait
+
 exit $RC