ITS#5189

[openldap] / tests / scripts / test037-manage

diff --git a/tests/scripts/test037-manage b/tests/scripts/test037-manage
index f28ec6ff0f21e316e2007ed4deb8bea7ce322a02..7527e122e0a1277cbe9cb952d8c63583ec7bece5 100755 (executable)
--- a/tests/scripts/test037-manage
+++ b/tests/scripts/test037-manage
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## 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
@@ -36,6 +36,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Testing slapd Manage operations..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
@@ -54,23 +56,9 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-# ITS#3898: #ifndef LDAP_DEVEL, the control is not available
-MANAGEDITOID="1.3.6.1.4.1.4203.666.5.12"
-case `$LDAPSEARCH -s base -b "" -h $LOCALHOST -p $PORT1 \
-       '(supportedControl:objectIdentifierMatch:='${MANAGEDITOID}')' \
-       supportedControl | grep "supportedControl: ${MANAGEDITOID}"` in
-"supportedControl: ${MANAGEDITOID}")
-       ;;
-*)
-       echo "The \"manageDIT\" control appears to be unsupported; test disabled"
-       test $KILLSERVERS != no && kill -HUP $KILLPIDS
-       exit 0
-       ;;
-esac
-
 echo "Testing modify, add, and delete..."
 $LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD \
-       -e \!manageDIT > \
+       -e \!relax > \
        $TESTOUT 2>&1 << EOMODS
 version: 1
 #
@@ -148,7 +136,7 @@ fi
 
 echo "Testing modify, add, and delete..."
 $LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD \
-       -e \!manageDIT > \
+       -e \!relax > \
        $TESTOUT 2>&1 << EOMODS
 version: 1
 #
@@ -240,4 +228,7 @@ if test $? != 0 ; then
 fi
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0