Update BDB requirements

[openldap] / tests / scripts / test041-aci

diff --git a/tests/scripts/test041-aci b/tests/scripts/test041-aci
index 0329c5ccae3c053d70eef8dca246ff5f3d9fe819..0afbfd7ac68f14c4bdb9eaac5cac8199e711c778 100755 (executable)
--- a/tests/scripts/test041-aci
+++ b/tests/scripts/test041-aci
@@ -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
@@ -13,19 +13,23 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
+echo "Test disabled."
+exit 0
+
 case "$BACKEND" in
 bdb|hdb|ldbm)
        ;;
 *)
        echo "Test does not support $BACKEND backend"
        exit 0
+       ;;
 esac
 
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
 
 if test "$ACI" = "acino" ; then
-       echo "ACI not enabled; skipping..."
+       echo "ACI not enabled, test skipped"
        exit 0
 fi
 
@@ -49,6 +53,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Testing slapd ACI access control..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
@@ -78,8 +84,11 @@ $LDAPSEARCH -s base -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
        '(objectclass=*)' >> $SEARCHOUT 2>> $TESTOUT
 RC=$?
 if test $RC != 32 ; then
-       echo "ldapsearch should have failed ($RC)!"
+       echo "ldapsearch should have failed with noSuchObject ($RC)!"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
+       if test $RC = 0 ; then
+               exit -1
+       fi
        exit $RC
 fi
 
@@ -92,7 +101,7 @@ RC=$?
 if test $RC = 0 ; then
        echo "ldapwhoami should have failed!"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
-       exit $RC
+       exit -1
 fi
 
 # Populate ACIs