From: Mark Andrews <marka@isc.org>
Date: Mon, 7 Aug 2023 08:22:29 +0000 (+1000)
Subject: Fix 'addr', 'ckresult' and 'drop' functions
X-Git-Tag: v9.19.17~59^2
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=1394f12a1c9adcd7b0953727417816bcd8e514b7;p=thirdparty%2Fbind9.git

Fix 'addr', 'ckresult' and 'drop' functions

'addr', 'ckresult' and 'drop' should return 0 rather than 1 after
calling 'setret' as the error has been logged and these functions
are not expect to fail.
---

diff --git a/bin/tests/system/rpz/tests.sh b/bin/tests/system/rpz/tests.sh
index 130be49f071..ac9967592d3 100644
--- a/bin/tests/system/rpz/tests.sh
+++ b/bin/tests/system/rpz/tests.sh
@@ -355,13 +355,13 @@ ckresult () {
 	grep -q 'Truncated, retrying in TCP' $DIGNM && trunc=1 || trunc=0
 	if [ "$tcp" -ne "$trunc" ]; then
 	    setret "'dig $digarg' wrong; no or unexpected truncation in $DIGNM"
-	    return 1
+	else
+	    clean_result ${DIGNM}*
 	fi
-	clean_result ${DIGNM}*
 	return 0
     fi
     setret "'dig $digarg' wrong; diff $DIGNM $2"
-    return 1
+    return 0
 }
 
 # check only that the server does not crash
@@ -409,11 +409,11 @@ addr () {
     ADDR_TTL=$(sed -n -e "s/^[-.a-z0-9]\{1,\}[	 ]*\([0-9]*\)	IN	AA*	${ADDR_ESC}\$/\1/p" $DIGNM)
     if test -z "$ADDR_TTL"; then
 	setret "'dig $2' wrong; no address $ADDR record in $DIGNM"
-	return 1
+	return 0
     fi
     if test -n "$3" && test "$ADDR_TTL" -ne "$3"; then
 	setret "'dig $2' wrong; TTL=$ADDR_TTL instead of $3 in $DIGNM"
-	return 1
+	return 0
     fi
     clean_result ${DIGNM}*
 }
@@ -455,7 +455,7 @@ drop () {
 	return 0
     fi
     setret "'dig $1' wrong; response in $DIGNM"
-    return 1
+    return 0
 }
 
 nsd() {