From a9baa693759754a401fabd5e4da7ab65f215c08e Mon Sep 17 00:00:00 2001
From: Pierangelo Masarati <ando@openldap.org>
Date: Wed, 5 Oct 2005 01:22:26 +0000
Subject: [PATCH] ldapmodify doesn't return an LDAP error code

---
 tests/scripts/test007-replication             | 20 +++++--------------
 tests/scripts/test018-syncreplication-persist | 20 +++++--------------
 2 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/tests/scripts/test007-replication b/tests/scripts/test007-replication
index 9d5db25b92..ea006738b8 100755
--- a/tests/scripts/test007-replication
+++ b/tests/scripts/test007-replication
@@ -281,9 +281,10 @@ KILLPIDS="$KILLPIDS $SLURPPID"
 echo "Waiting 15 seconds for slurpd to send changes..."
 sleep 15
 
-echo "Try updating the slave slapd..."
-$LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT2 -w $PASSWD > \
-	$TESTOUT 2>&1 << EOMODS
+if test ! $BACKLDAP = "ldapno" ; then
+	echo "Try updating the slave slapd..."
+	$LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT2 -w $PASSWD > \
+		$TESTOUT 2>&1 << EOMODS
 dn: cn=James A Jones 1, ou=Alumni Association, ou=People, dc=example, dc=com
 changetype: modify
 add: description
@@ -292,18 +293,7 @@ description: unless the chain overlay is configured appropriately ;)
 
 EOMODS
 
-RC=$?
-
-if test $BACKLDAP = "ldapno" ; then
-	# expect 10 (LDAP_REFERRAL)...
-	if test $RC != 10 ; then
-		echo "ldapmodify should have failed ($RC)!"
-		test $KILLSERVERS != no && kill -HUP $KILLPIDS
-		exit $RC
-	fi
-
-else
-	# expect 0 (LDAP_SUCCESS)...
+	RC=$?
 	if test $RC != 0 ; then
 		echo "ldapmodify failed ($RC)!"
 		test $KILLSERVERS != no && kill -HUP $KILLPIDS
diff --git a/tests/scripts/test018-syncreplication-persist b/tests/scripts/test018-syncreplication-persist
index c0d364dad2..e7bb8f1512 100755
--- a/tests/scripts/test018-syncreplication-persist
+++ b/tests/scripts/test018-syncreplication-persist
@@ -279,9 +279,10 @@ KILLPIDS="$PID $SLAVEPID"
 echo "Waiting 25 seconds for syncrepl to receive changes..."
 sleep 25
 
-echo "Try updating the slave slapd..."
-$LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT4 -w $PASSWD > \
-	$TESTOUT 2>&1 << EOMODS
+if test ! $BACKLDAP = "ldapno" ; then
+	echo "Try updating the slave slapd..."
+	$LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT4 -w $PASSWD > \
+		$TESTOUT 2>&1 << EOMODS
 dn: cn=James A Jones 1, ou=Alumni Association, ou=People, dc=example, dc=com
 changetype: modify
 add: description
@@ -290,18 +291,7 @@ description: unless the chain overlay is configured appropriately ;)
 
 EOMODS
 
-RC=$?
-
-if test $BACKLDAP = "ldapno" ; then
-	# expect 10 (LDAP_REFERRAL)...
-	if test $RC != 10 ; then
-		echo "ldapmodify should have failed ($RC)!"
-		test $KILLSERVERS != no && kill -HUP $KILLPIDS
-		exit $RC
-	fi
-
-else
-	# expect 0 (LDAP_SUCCESS)...
+	RC=$?
 	if test $RC != 0 ; then
 		echo "ldapmodify failed ($RC)!"
 		test $KILLSERVERS != no && kill -HUP $KILLPIDS
-- 
2.39.5