96 lines
2.8 KiB
Diff
96 lines
2.8 KiB
Diff
|
From c88b4c85db310ecd0f2f5bb02478cc56f5590d53 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Quanah Gibson-Mount <quanah@openldap.org>
|
||
|
|
Date: Wed, 3 Oct 2018 20:28:54 +0000
|
||
|
|
Subject: [PATCH] Update test044 to catch ITS#8923
|
||
|
|
|
||
|
|
DTS/AR:
|
||
|
|
reason:
|
||
|
|
---
|
||
|
|
openldap-2.4.46/tests/scripts/test044-dynlist | 30 +++++++++++++++++++++++++++
|
||
|
|
openldap-2.4.46/tests/scripts/defines.sh | 1 +
|
||
|
|
openldap-2.4.46/tests/scripts/test044-dynlist | 8 ++++----
|
||
|
|
3 file changed, 35 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/tests/scripts/test044-dynlist b/tests/scripts/test044-dynlist
|
||
|
|
index 07b65c5..4c6390e 100755
|
||
|
|
--- a/tests/scripts/test044-dynlist
|
||
|
|
+++ b/tests/scripts/test044-dynlist
|
||
|
|
@@ -468,6 +468,36 @@ case $RC in
|
||
|
|
esac
|
||
|
|
echo "" >> $SEARCHOUT
|
||
|
|
|
||
|
|
+CMPDN="$BADBJORNSDN"
|
||
|
|
+echo "Testing list compare (should return FALSE)..."
|
||
|
|
+echo "# Testing list compare... (should return FALSE)" >> $SEARCHOUT
|
||
|
|
+$LDAPCOMPARE -h $LOCALHOST -p $PORT1 \
|
||
|
|
+ "cn=Dynamic List of Members,$LISTDN" "member:$CMPDN" \
|
||
|
|
+ >> $SEARCHOUT 2>&1
|
||
|
|
+RC=$?
|
||
|
|
+case $RC in
|
||
|
|
+5)
|
||
|
|
+ echo "ldapcompare returned FALSE ($RC)"
|
||
|
|
+ ;;
|
||
|
|
+6)
|
||
|
|
+ echo "ldapcompare returned TRUE ($RC)!"
|
||
|
|
+ test $KILLSERVERS != no && kill -HUP $KILLPIDS
|
||
|
|
+ exit $RC
|
||
|
|
+ ;;
|
||
|
|
+0)
|
||
|
|
+ echo "ldapcompare returned success ($RC)!"
|
||
|
|
+ test $KILLSERVERS != no && kill -HUP $KILLPIDS
|
||
|
|
+ exit -1
|
||
|
|
+ ;;
|
||
|
|
+*)
|
||
|
|
+ echo "ldapcompare failed ($RC)!"
|
||
|
|
+ test $KILLSERVERS != no && kill -HUP $KILLPIDS
|
||
|
|
+ exit $RC
|
||
|
|
+ ;;
|
||
|
|
+esac
|
||
|
|
+echo "" >> $SEARCHOUT
|
||
|
|
+
|
||
|
|
+
|
||
|
|
CMPDN="$BJORNSDN"
|
||
|
|
echo "Testing list compare (should return FALSE)..."
|
||
|
|
echo "# Testing list compare (should return FALSE)..." >> $SEARCHOUT
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/openldap-2.4.46/tests/scripts/defines.sh b/openldap-2.4.46/tests/scripts/defines.sh
|
||
|
|
index 97cf08f..7d62023 100755
|
||
|
|
--- a/tests/scripts/defines.sh
|
||
|
|
+++ b/tests/scripts/defines.sh
|
||
|
|
@@ -261,6 +261,7 @@ UPDATEDN="cn=Replica,$BASEDN"
|
||
|
|
PASSWD=secret
|
||
|
|
BABSDN="cn=Barbara Jensen,ou=Information Technology DivisioN,ou=People,$BASEDN"
|
||
|
|
BJORNSDN="cn=Bjorn Jensen,ou=Information Technology DivisioN,ou=People,$BASEDN"
|
||
|
|
+BADBJORNSDN="cn=Bjorn JensenNotReally,ou=Information Technology DivisioN,ou=People,$BASEDN"
|
||
|
|
JAJDN="cn=James A Jones 1,ou=Alumni Association,ou=People,$BASEDN"
|
||
|
|
JOHNDDN="cn=John Doe,ou=Information Technology Division,ou=People,$BASEDN"
|
||
|
|
MELLIOTDN="cn=Mark Elliot,ou=Alumni Association,ou=People,$BASEDN"
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/tests/scripts/test044-dynlist b/tests/scripts/test044-dynlist
|
||
|
|
index 4c6390e..8ace1a8 100755
|
||
|
|
--- a/tests/scripts/test044-dynlist
|
||
|
|
+++ b/tests/scripts/test044-dynlist
|
||
|
|
@@ -448,13 +448,13 @@ $LDAPCOMPARE -h $LOCALHOST -p $PORT1 \
|
||
|
|
RC=$?
|
||
|
|
case $RC in
|
||
|
|
5)
|
||
|
|
- echo "ldapcompare returned FALSE ($RC)"
|
||
|
|
- ;;
|
||
|
|
-6)
|
||
|
|
- echo "ldapcompare returned TRUE ($RC)!"
|
||
|
|
+ echo "ldapcompare returned FALSE ($RC)!"
|
||
|
|
test $KILLSERVERS != no && kill -HUP $KILLPIDS
|
||
|
|
exit $RC
|
||
|
|
;;
|
||
|
|
+6)
|
||
|
|
+ echo "ldapcompare returned TRUE ($RC)"
|
||
|
|
+ ;;
|
||
|
|
0)
|
||
|
|
echo "ldapcompare returned success ($RC)!"
|
||
|
|
test $KILLSERVERS != no && kill -HUP $KILLPIDS
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|