Merging upstream version 1:9.18.24.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 122 insertions, 118 deletions

diff --git a/bin/tests/system/unknown/setup.sh b/bin/tests/system/unknown/setup.sh
index 0c043bf..b08a677 100644
--- a/bin/tests/system/unknown/setup.sh
+++ b/bin/tests/system/unknown/setup.sh
@@ -17,4 +17,7 @@ copy_setports ns1/named.conf.in ns1/named.conf
 copy_setports ns2/named.conf.in ns2/named.conf
 copy_setports ns3/named.conf.in ns3/named.conf
 
-(cd ns3; $SHELL -e sign.sh)
+(
+  cd ns3
+  $SHELL -e sign.sh
+)
diff --git a/bin/tests/system/unknown/tests.sh b/bin/tests/system/unknown/tests.sh
index f52b50e..eb61f21 100644
--- a/bin/tests/system/unknown/tests.sh
+++ b/bin/tests/system/unknown/tests.sh
@@ -21,144 +21,136 @@ n=0
 DIGOPTS="-p ${PORT}"
 
 dig_cmd() {
-	# shellcheck disable=SC2086
-	"$DIG" $DIGOPTS "$@" | grep -v '^;'
+  # shellcheck disable=SC2086
+  "$DIG" $DIGOPTS "$@" | grep -v '^;'
 }
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "querying for various representations of an IN A record ($n)"
-for i in 1 2 3 4 5 6 7 8 9 10 11 12
-do
-	ret=0
-	dig_cmd +short @10.53.0.1 a$i.example a in > dig.out.$i.test$n
-	echo 10.0.0.1 | diff - dig.out.$i.test$n || ret=1
-	if [ $ret != 0 ]
-	then
-		echo_i "#$i failed"
-	fi
-	status=$((status + ret))
+for i in 1 2 3 4 5 6 7 8 9 10 11 12; do
+  ret=0
+  dig_cmd +short @10.53.0.1 a$i.example a in >dig.out.$i.test$n
+  echo 10.0.0.1 | diff - dig.out.$i.test$n || ret=1
+  if [ $ret != 0 ]; then
+    echo_i "#$i failed"
+  fi
+  status=$((status + ret))
 done
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "querying for various representations of an IN TXT record ($n)"
-for i in 1 2 3 4 5 6 7
-do
-	ret=0
-	dig_cmd +short @10.53.0.1 txt$i.example txt in > dig.out.$i.test$n
-	echo '"hello"' | diff - dig.out.$i.test$n || ret=1
-	if [ $ret != 0 ]
-	then
-		echo_i "#$i failed"
-	fi
-	status=$((status + ret))
+for i in 1 2 3 4 5 6 7; do
+  ret=0
+  dig_cmd +short @10.53.0.1 txt$i.example txt in >dig.out.$i.test$n
+  echo '"hello"' | diff - dig.out.$i.test$n || ret=1
+  if [ $ret != 0 ]; then
+    echo_i "#$i failed"
+  fi
+  status=$((status + ret))
 done
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "querying for various representations of an IN TYPE123 record ($n)"
-for i in 1 2 3
-do
-	ret=0
-	dig_cmd +short @10.53.0.1 unk$i.example type123 in > dig.out.$i.test$n
-	echo '\# 1 00' | diff - dig.out.$i.test$n || ret=1
-	if [ $ret != 0 ]
-	then
-		echo_i "#$i failed"
-	fi
-	status=$((status + ret))
+for i in 1 2 3; do
+  ret=0
+  dig_cmd +short @10.53.0.1 unk$i.example type123 in >dig.out.$i.test$n
+  echo '\# 1 00' | diff - dig.out.$i.test$n || ret=1
+  if [ $ret != 0 ]; then
+    echo_i "#$i failed"
+  fi
+  status=$((status + ret))
 done
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "querying for NULL record ($n)"
 ret=0
-dig_cmd +short @10.53.0.1 null.example null in > dig.out.test$n
+dig_cmd +short @10.53.0.1 null.example null in >dig.out.test$n
 echo '\# 1 00' | diff - dig.out.test$n || ret=1
 [ $ret = 0 ] || echo_i "failed"
 status=$((status + ret))
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "querying for empty NULL record ($n)"
 ret=0
-dig_cmd +short @10.53.0.1 empty.example null in > dig.out.test$n
+dig_cmd +short @10.53.0.1 empty.example null in >dig.out.test$n
 echo '\# 0' | diff - dig.out.test$n || ret=1
 [ $ret = 0 ] || echo_i "failed"
 status=$((status + ret))
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "querying for various representations of a CLASS10 TYPE1 record ($n)"
-for i in 1 2
-do
-	ret=0
-	dig_cmd +short @10.53.0.1 a$i.example a class10 > dig.out.$i.test$n
-	echo '\# 4 0A000001' | diff - dig.out.$i.test$n || ret=1
-	if [ $ret != 0 ]
-	then
-		echo_i "#$i failed"
-	fi
-	status=$((status + ret))
+for i in 1 2; do
+  ret=0
+  dig_cmd +short @10.53.0.1 a$i.example a class10 >dig.out.$i.test$n
+  echo '\# 4 0A000001' | diff - dig.out.$i.test$n || ret=1
+  if [ $ret != 0 ]; then
+    echo_i "#$i failed"
+  fi
+  status=$((status + ret))
 done
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "querying for various representations of a CLASS10 TXT record ($n)"
-for i in 1 2 3 4
-do
-	ret=0
-	dig_cmd +short @10.53.0.1 txt$i.example txt class10 > dig.out.$i.test$n
-	echo '"hello"' | diff - dig.out.$i.test$n || ret=1
-	if [ $ret != 0 ]
-	then
-		echo_i "#$i failed"
-	fi
-	status=$((status + ret))
+for i in 1 2 3 4; do
+  ret=0
+  dig_cmd +short @10.53.0.1 txt$i.example txt class10 >dig.out.$i.test$n
+  echo '"hello"' | diff - dig.out.$i.test$n || ret=1
+  if [ $ret != 0 ]; then
+    echo_i "#$i failed"
+  fi
+  status=$((status + ret))
 done
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "querying for various representations of a CLASS10 TYPE123 record ($n)"
-for i in 1 2
-do
-	ret=0
-	dig_cmd +short @10.53.0.1 unk$i.example type123 class10 > dig.out.$i.test$n
-	echo '\# 1 00' | diff - dig.out.$i.test$n || ret=1
-	if [ $ret != 0 ]
-	then
-		echo_i "#$i failed"
-	fi
-	status=$((status + ret))
+for i in 1 2; do
+  ret=0
+  dig_cmd +short @10.53.0.1 unk$i.example type123 class10 >dig.out.$i.test$n
+  echo '\# 1 00' | diff - dig.out.$i.test$n || ret=1
+  if [ $ret != 0 ]; then
+    echo_i "#$i failed"
+  fi
+  status=$((status + ret))
 done
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "querying for SOAs of zone that should have failed to load ($n)"
-for i in 1 2 3 4
-do
-	ret=0
-	$DIG $DIGOPTS @10.53.0.1 broken$i. soa in > dig.out.$i.test$n || ret=1
-	grep "SERVFAIL" dig.out.$i.test$n > /dev/null || ret=1
-	if [ $ret != 0 ]
-	then
-		echo_i "#$i failed"
-	fi
-	status=$((status + ret))
+for i in 1 2 3 4; do
+  ret=0
+  $DIG $DIGOPTS @10.53.0.1 broken$i. soa in >dig.out.$i.test$n || ret=1
+  grep "SERVFAIL" dig.out.$i.test$n >/dev/null || ret=1
+  if [ $ret != 0 ]; then
+    echo_i "#$i failed"
+  fi
+  status=$((status + ret))
 done
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "checking large unknown record loading on primary ($n)"
 for try in 0 1 2 3 4 5 6 7 8 9; do
-    ret=0
-    dig_cmd @10.53.0.1 +tcp +short large.example TYPE45234 > dig.out.$i.test$n
-    diff -s large.out dig.out.$i.test$n > /dev/null || { ret=1 ; echo_i "diff failed"; }
-    [ "$ret" -eq 0 ] && break
-    sleep 1
+  ret=0
+  dig_cmd @10.53.0.1 +tcp +short large.example TYPE45234 >dig.out.$i.test$n
+  diff -s large.out dig.out.$i.test$n >/dev/null || {
+    ret=1
+    echo_i "diff failed"
+  }
+  [ "$ret" -eq 0 ] && break
+  sleep 1
 done
 [ $ret = 0 ] || echo_i "failed"
 status=$((status + ret))
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "checking large unknown record loading on secondary ($n)"
 for try in 0 1 2 3 4 5 6 7 8 9; do
-    ret=0
-    dig_cmd @10.53.0.2 +tcp +short large.example TYPE45234 > dig.out.$i.test$n
-    diff -s large.out dig.out.$i.test$n > /dev/null || { ret=1 ; echo_i "diff failed"; }
-    [ "$ret" -eq 0 ] && break
-    sleep 1
+  ret=0
+  dig_cmd @10.53.0.2 +tcp +short large.example TYPE45234 >dig.out.$i.test$n
+  diff -s large.out dig.out.$i.test$n >/dev/null || {
+    ret=1
+    echo_i "diff failed"
+  }
+  [ "$ret" -eq 0 ] && break
+  sleep 1
 done
 [ $ret = 0 ] || echo_i "failed"
 status=$((status + ret))
@@ -169,23 +161,29 @@ start_server --noclean --restart --port ${PORT} ns2
 
 # server may be answering queries before zones are loaded,
 # so retry a few times if this query fails
-n=$((n+1))
+n=$((n + 1))
 echo_i "checking large unknown record loading on secondary ($n)"
 for try in 0 1 2 3 4 5 6 7 8 9; do
-    ret=0
-    dig_cmd @10.53.0.2 +tcp +short large.example TYPE45234 > dig.out.$i.test$n
-    diff -s large.out dig.out.$i.test$n > /dev/null || { ret=1 ; echo_i "diff failed"; }
-    [ "$ret" -eq 0 ] && break
-    sleep 1
+  ret=0
+  dig_cmd @10.53.0.2 +tcp +short large.example TYPE45234 >dig.out.$i.test$n
+  diff -s large.out dig.out.$i.test$n >/dev/null || {
+    ret=1
+    echo_i "diff failed"
+  }
+  [ "$ret" -eq 0 ] && break
+  sleep 1
 done
 [ $ret = 0 ] || echo_i "failed"
 status=$((status + ret))
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "checking large unknown record loading on inline secondary ($n)"
 ret=0
-dig_cmd @10.53.0.3 +tcp +short large.example TYPE45234 > dig.out.test$n
-diff large.out dig.out.test$n > /dev/null || { ret=1 ; echo_i "diff failed"; }
+dig_cmd @10.53.0.3 +tcp +short large.example TYPE45234 >dig.out.test$n
+diff large.out dig.out.test$n >/dev/null || {
+  ret=1
+  echo_i "diff failed"
+}
 [ $ret = 0 ] || echo_i "failed"
 status=$((status + ret))
 
@@ -195,39 +193,42 @@ start_server --noclean --restart --port ${PORT} ns3
 
 # server may be answering queries before zones are loaded,
 # so retry a few times if this query fails
-n=$((n+1))
+n=$((n + 1))
 echo_i "checking large unknown record loading on inline secondary ($n)"
 for try in 0 1 2 3 4 5 6 7 8 9; do
-    ret=0
-    dig_cmd @10.53.0.3 +tcp +short large.example TYPE45234 > dig.out.$i.test$n
-    diff large.out dig.out.$i.test$n > /dev/null || { ret=1 ; echo_i "diff failed"; }
-    [ "$ret" -eq 0 ] && break
-    sleep 1
+  ret=0
+  dig_cmd @10.53.0.3 +tcp +short large.example TYPE45234 >dig.out.$i.test$n
+  diff large.out dig.out.$i.test$n >/dev/null || {
+    ret=1
+    echo_i "diff failed"
+  }
+  [ "$ret" -eq 0 ] && break
+  sleep 1
 done
 [ $ret = 0 ] || echo_i "failed"
 status=$((status + ret))
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "check that '"'"\\#"'"' is not treated as the unknown escape sequence ($n)"
 ret=0
-dig_cmd @10.53.0.1 +tcp +short txt8.example txt > dig.out.test$n
+dig_cmd @10.53.0.1 +tcp +short txt8.example txt >dig.out.test$n
 echo '"#" "2" "0145"' | diff - dig.out.test$n || ret=1
 [ $ret = 0 ] || echo_i "failed"
 status=$((status + ret))
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "check that 'TXT \# text' is not treated as the unknown escape sequence ($n)"
 ret=0
-dig_cmd @10.53.0.1 +tcp +short txt9.example txt > dig.out.test$n
+dig_cmd @10.53.0.1 +tcp +short txt9.example txt >dig.out.test$n
 echo '"#" "text"' | diff - dig.out.test$n || ret=1
 [ $ret = 0 ] || echo_i "failed"
 status=$((status + ret))
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "check that 'TYPE353 \# cat' produces 'not a valid number' ($n)"
 ret=0
-$CHECKZONE nan.bad zones/nan.bad > check.out 2>&1 && ret=1
-grep "not a valid number" check.out > /dev/null || ret=1
+$CHECKZONE nan.bad zones/nan.bad >check.out 2>&1 && ret=1
+grep "not a valid number" check.out >/dev/null || ret=1
 [ $ret = 0 ] || echo_i "failed"
 status=$((status + ret))