Update whoami test

diff --git a/CHANGES b/CHANGES
index 7e7b2bc7566ba7057980950d854654594238f61e..d2ca1c92004dcbcab8a4d59a502f7c96c1609ad2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,7 @@ OpenLDAP 2.1.9 Engineering
        Added "allow update_anon" feature (ITS#2155)
        Build Environment
                Add subordinate referral test
+               Updated whoami test
                Fix configure shtool no bold handling
 
 OpenLDAP 2.1.8 Release

diff --git a/tests/scripts/test014-whoami b/tests/scripts/test014-whoami
index 6c42968276401e6cd88ffbf5dc974f046e88f538..b6aea511cc0b1b57f2269d2ea565daaaec0a9a62 100755 (executable)
--- a/tests/scripts/test014-whoami
+++ b/tests/scripts/test014-whoami
@@ -46,9 +46,18 @@ for i in 0 1 2 3 4 5; do
        sleep 5
 done
 
-echo "Testing ldapwhoami ..."
-$LDAPWHOAMI -h $LOCALHOST -p $PORT \
-       -D "$MANAGERDN" -w $PASSWD
+echo "Testing ldapwhoami as anonymous..."
+$LDAPWHOAMI -h $LOCALHOST -p $PORT
+
+RC=$?
+if test $RC != 0 ; then
+       echo "ldapwhoami failed ($RC)!"
+       kill -HUP $PID
+       exit $RC
+fi
+
+echo "Testing ldapwhoami as ${MANAGERDN}..."
+$LDAPWHOAMI -h $LOCALHOST -p $PORT -D "$MANAGERDN" -w $PASSWD
 
 RC=$?
 if test $RC != 0 ; then