Update test005-modrdn to handle success without entries

diff --git a/tests/scripts/test005-modrdn b/tests/scripts/test005-modrdn
index 107d602b8b07bc0b7f7e195e7c3b2d9585604246..5eabb65b3656286df13dbf90e50758579cce475e 100755 (executable)
--- a/tests/scripts/test005-modrdn
+++ b/tests/scripts/test005-modrdn
@@ -74,8 +74,7 @@ fi
 
 echo "Using ldapsearch to retrieve entries using new rdn (cn=James A Jones III)..."
 $LDAPSEARCH -S "" -b "$BASEDN" -h localhost -p $PORT \
-           'cn=James A Jones III' | egrep -iv '^createtimestamp:|^modifytimestamp:' \
-           > $SEARCHOUT 2>&1
+           'cn=James A Jones III' > $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
        echo "ldapsearch failed!"
@@ -102,8 +101,7 @@ fi
 
 echo "Using ldapsearch to retrieve entries using new rdn (cn=James A Jones II)..."
 $LDAPSEARCH -S "" -b "$BASEDN" -h localhost -p $PORT \
-           'cn=James A Jones II' | egrep -iv '^createtimestamp:|^modifytimestamp:' \
-           >  $SEARCHOUT 2>&1
+           'cn=James A Jones II' > $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
        echo "ldapsearch failed!"
@@ -132,14 +130,19 @@ fi
 
 echo "Using ldapsearch to retrieve entries using removed rdn (cn=James A Jones 2)..."
 $LDAPSEARCH -S "" -b "$BASEDN" -h localhost -p $PORT \
-           'cn=James A Jones 2' | egrep -iv '^createtimestamp:|^modifytimestamp:' \
-           > /dev/null 2>&1
+           'cn=James A Jones 2' > $SEARCHOUT 2>&1
 RC=$?
-if test $RC = 0 ; then
-       echo "failure: ldapsearch found attribute that was to be removed!"
+if test $RC != 0 ; then
        kill -HUP $PID
+       echo "ldapsearch failed!"
        exit $RC
 fi
+cmp $SEARCHOUT /dev/null
+if test $? != 0 ; then
+       echo "failure: ldapsearch found attribute that was to be removed!"
+       kill -HUP $PID
+       exit 1
+fi
 
 echo "Using ldapsearch to retrieve all the entries..."
 $LDAPSEARCH -S "" -b "$BASEDN" -h localhost -p $PORT \
@@ -183,8 +186,7 @@ fi
 
 echo "Using ldapsearch to retrieve entries using new rdn (cn=James A Jones 1)..."
 $LDAPSEARCH -S "" -b "$BASEDN" -h localhost -p $PORT \
-           'cn=James A Jones 1' | egrep -iv '^createtimestamp:|^modifytimestamp:' \
-           >  $SEARCHOUT 2>&1
+           'cn=James A Jones 1' > $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
        echo "ldapsearch failed!"