From 6982d10993002961a8b3f54fbc641afe86420f7e Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Thu, 19 Mar 2026 15:18:46 +1100
Subject: [PATCH] Check exit status of dig and nsupdate in nsupdate system test

Add missing `|| ret=1` to six dig and nsupdate invocations in
tests.sh so that command failures are properly caught instead
of silently ignored.

(cherry picked from commit 9ba03a1848904b605f64fbfe3dab00b551828e4b)
---
 bin/tests/system/nsupdate/tests.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/tests/system/nsupdate/tests.sh b/bin/tests/system/nsupdate/tests.sh
index 7afe114677..e7c6283569 100755
--- a/bin/tests/system/nsupdate/tests.sh
+++ b/bin/tests/system/nsupdate/tests.sh
@@ -734,7 +734,7 @@ END
 grep REFUSED nsupdate.out.$n >/dev/null 2>&1 || ret=1
 $DIG $DIGOPTS @10.53.0.6 \
   +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd \
-  -x 127.0.0.1 >dig.out.ns6.$n
+  -x 127.0.0.1 >dig.out.ns6.$n || ret=1
 grep localhost. dig.out.ns6.$n >/dev/null 2>&1 && ret=1
 if test $ret -ne 0; then
   echo_i "failed"
@@ -772,7 +772,7 @@ END
 grep REFUSED nsupdate.out.$n >/dev/null 2>&1 || ret=1
 $DIG $DIGOPTS @10.53.0.6 \
   +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd \
-  -x 192.168.0.1 >dig.out.ns6.$n
+  -x 192.168.0.1 >dig.out.ns6.$n || ret=1
 grep localhost. dig.out.ns6.$n >/dev/null 2>&1 && ret=1
 if test $ret -ne 0; then
   echo_i "failed"
@@ -793,7 +793,7 @@ END
 grep REFUSED nsupdate.out.$n >/dev/null 2>&1 || ret=1
 $DIG $DIGOPTS @10.53.0.6 \
   +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd \
-  $REVERSE_NAME NS >dig.out.ns6.$n
+  $REVERSE_NAME NS >dig.out.ns6.$n || ret=1
 grep localhost. dig.out.ns6.$n >/dev/null 2>&1 && ret=1
 if test $ret -ne 0; then
   echo_i "failed"
@@ -835,7 +835,7 @@ END
 grep REFUSED nsupdate.out.$n >/dev/null 2>&1 || ret=1
 $DIG $DIGOPTS @fd92:7065:b8e:ffff::6 \
   +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd \
-  $REVERSE_NAME NS >dig.out.ns6.$n
+  $REVERSE_NAME NS >dig.out.ns6.$n || ret=1
 grep localhost. dig.out.ns6.$n >/dev/null 2>&1 && ret=1
 if test $ret -ne 0; then
   echo_i "failed"
@@ -1858,7 +1858,7 @@ n=$((n + 1))
 ret=0
 echo_i "check that max records is enforced ($n)"
 nextpart ns6/named.run >/dev/null
-$NSUPDATE -v >nsupdate.out.$n 2>&1 <<END
+$NSUPDATE -v >nsupdate.out.$n 2>&1 <<END || ret=1
 server 10.53.0.6 ${PORT}
 local 10.53.0.5
 update del 5.0.53.10.in-addr.arpa.
@@ -1884,7 +1884,7 @@ n=$((n + 1))
 ret=0
 echo_i "check that max records for ANY is enforced ($n)"
 nextpart ns6/named.run >/dev/null
-$NSUPDATE -v >nsupdate.out.$n 2>&1 <<END
+$NSUPDATE -v >nsupdate.out.$n 2>&1 <<END || ret=1
 server 10.53.0.6 ${PORT}
 local 10.53.0.5
 update del 5.0.53.10.in-addr.arpa.