Merging upstream version 1:9.16.48.

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

3 files changed, 195 insertions, 199 deletions

diff --git a/bin/tests/system/xfer/prereq.sh b/bin/tests/system/xfer/prereq.sh
index b262501..923d4b4 100644
--- a/bin/tests/system/xfer/prereq.sh
+++ b/bin/tests/system/xfer/prereq.sh
@@ -14,22 +14,19 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-if $PERL -e 'use Net::DNS;' 2>/dev/null
-then
-    if $PERL -e 'use Net::DNS; die if ($Net::DNS::VERSION >= 0.69 && $Net::DNS::VERSION <= 0.74);' 2>/dev/null
-    then
-        :
-    else
-        echo_i "Net::DNS versions 0.69 to 0.74 have bugs that cause this test to fail: please update." >&2
-        exit 1
-    fi
-else
-    echo_i "This test requires the Net::DNS library." >&2
+if $PERL -e 'use Net::DNS;' 2>/dev/null; then
+  if $PERL -e 'use Net::DNS; die if ($Net::DNS::VERSION >= 0.69 && $Net::DNS::VERSION <= 0.74);' 2>/dev/null; then
+    :
+  else
+    echo_i "Net::DNS versions 0.69 to 0.74 have bugs that cause this test to fail: please update." >&2
     exit 1
+  fi
+else
+  echo_i "This test requires the Net::DNS library." >&2
+  exit 1
 fi
 
-if ! $PERL -e 'use Digest::HMAC;' 2>/dev/null
-then
-    echo_i "This test requires the Digest::HMAC Perl module." >&2
-    exit 1
+if ! $PERL -e 'use Digest::HMAC;' 2>/dev/null; then
+  echo_i "This test requires the Digest::HMAC Perl module." >&2
+  exit 1
 fi
diff --git a/bin/tests/system/xfer/setup.sh b/bin/tests/system/xfer/setup.sh
index 3180a7f..13cece1 100644
--- a/bin/tests/system/xfer/setup.sh
+++ b/bin/tests/system/xfer/setup.sh
@@ -22,7 +22,7 @@ $SHELL ../genzone.sh 6 3 >ns6/primary.db
 $SHELL ../genzone.sh 7 >ns7/primary2.db
 
 cp -f ns4/root.db.in ns4/root.db
-$PERL -e 'for ($i=0;$i<10000;$i++){ printf("x%u 0 in a 10.53.0.1\n", $i);}' >> ns4/root.db
+$PERL -e 'for ($i=0;$i<10000;$i++){ printf("x%u 0 in a 10.53.0.1\n", $i);}' >>ns4/root.db
 
 copy_setports ns1/named.conf.in ns1/named.conf
 copy_setports ns2/named.conf.in ns2/named.conf
@@ -38,7 +38,7 @@ touch -t 200101010000 ns2/sec.db
 
 cp ns2/mapped.db.in ns2/mapped.db
 
-$PERL -e 'for ($i=0;$i<4096;$i++){ printf("name%u 259200 A 1.2.3.4\nname%u 259200 TXT \"Hello World %u\"\n", $i, $i, $i);}' > ns8/small.db
-$PERL -e 'printf("large IN TYPE45234 \\# 48000 "); for ($i=0;$i<16*3000;$i++) { printf("%02x", $i % 256); } printf("\n");' > ns8/large.db
+$PERL -e 'for ($i=0;$i<4096;$i++){ printf("name%u 259200 A 1.2.3.4\nname%u 259200 TXT \"Hello World %u\"\n", $i, $i, $i);}' >ns8/small.db
+$PERL -e 'printf("large IN TYPE45234 \\# 48000 "); for ($i=0;$i<16*3000;$i++) { printf("%02x", $i % 256); } printf("\n");' >ns8/large.db
 
 cp -f ns1/ixfr-too-big.db.in ns1/ixfr-too-big.db
diff --git a/bin/tests/system/xfer/tests.sh b/bin/tests/system/xfer/tests.sh
index 607d68a..b8cb027 100755
--- a/bin/tests/system/xfer/tests.sh
+++ b/bin/tests/system/xfer/tests.sh
@@ -20,51 +20,51 @@ RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p ${CONTROLPORT} -s"
 status=0
 n=0
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "testing basic zone transfer functionality (from primary) ($n)"
 tmp=0
-$DIG $DIGOPTS example. @10.53.0.2 axfr > dig.out.ns2.test$n || tmp=1
+$DIG $DIGOPTS example. @10.53.0.2 axfr >dig.out.ns2.test$n || tmp=1
 grep "^;" dig.out.ns2.test$n | cat_i
 digcomp dig1.good dig.out.ns2.test$n || tmp=1
-if test $tmp != 0 ; then echo_i "failed"; fi
-status=$((status+tmp))
+if test $tmp != 0; then echo_i "failed"; fi
+status=$((status + tmp))
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "testing basic zone transfer functionality (from secondary) ($n)"
 tmp=0
 #
 # Spin to allow the zone to transfer.
 #
-wait_for_xfer () {
-	$DIG $DIGOPTS example. @10.53.0.3 axfr > dig.out.ns3.test$n || return 1
-	grep "^;" dig.out.ns3.test$n > /dev/null && return 1
-	return 0
+wait_for_xfer() {
+  $DIG $DIGOPTS example. @10.53.0.3 axfr >dig.out.ns3.test$n || return 1
+  grep "^;" dig.out.ns3.test$n >/dev/null && return 1
+  return 0
 }
 retry_quiet 25 wait_for_xfer || tmp=1
 grep "^;" dig.out.ns3.test$n | cat_i
 digcomp dig1.good dig.out.ns3.test$n || tmp=1
-if test $tmp != 0 ; then echo_i "failed"; fi
-status=$((status+tmp))
+if test $tmp != 0; then echo_i "failed"; fi
+status=$((status + tmp))
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "testing TSIG signed zone transfers ($n)"
 tmp=0
-$DIG $DIGOPTS tsigzone. @10.53.0.2 axfr -y tsigzone.:1234abcd8765 > dig.out.ns2.test$n || tmp=1
+$DIG $DIGOPTS tsigzone. @10.53.0.2 axfr -y tsigzone.:1234abcd8765 >dig.out.ns2.test$n || tmp=1
 grep "^;" dig.out.ns2.test$n | cat_i
 
 #
 # Spin to allow the zone to transfer.
 #
-wait_for_xfer_tsig () {
-	$DIG $DIGOPTS tsigzone. @10.53.0.3 axfr -y tsigzone.:1234abcd8765 > dig.out.ns3.test$n || return 1
-	grep "^;" dig.out.ns3.test$n > /dev/null && return 1
-	return 0
+wait_for_xfer_tsig() {
+  $DIG $DIGOPTS tsigzone. @10.53.0.3 axfr -y tsigzone.:1234abcd8765 >dig.out.ns3.test$n || return 1
+  grep "^;" dig.out.ns3.test$n >/dev/null && return 1
+  return 0
 }
 retry_quiet 25 wait_for_xfer_tsig || tmp=1
 grep "^;" dig.out.ns3.test$n | cat_i
 digcomp dig.out.ns2.test$n dig.out.ns3.test$n || tmp=1
-if test $tmp != 0 ; then echo_i "failed"; fi
-status=$((status+tmp))
+if test $tmp != 0; then echo_i "failed"; fi
+status=$((status + tmp))
 
 echo_i "reload servers for in preparation for ixfr-from-differences tests"
 
@@ -108,53 +108,53 @@ rndc_reload ns7 10.53.0.7
 
 sleep 3
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "testing zone is dumped after successful transfer ($n)"
 tmp=0
 $DIG $DIGOPTS +noall +answer +multi @10.53.0.2 \
-	secondary. soa > dig.out.ns2.test$n || tmp=1
-grep "1397051952 ; serial" dig.out.ns2.test$n > /dev/null 2>&1 || tmp=1
-grep "1397051952 ; serial" ns2/sec.db > /dev/null 2>&1 || tmp=1
-if test $tmp != 0 ; then echo_i "failed"; fi
-status=$((status+tmp))
+  secondary. soa >dig.out.ns2.test$n || tmp=1
+grep "1397051952 ; serial" dig.out.ns2.test$n >/dev/null 2>&1 || tmp=1
+grep "1397051952 ; serial" ns2/sec.db >/dev/null 2>&1 || tmp=1
+if test $tmp != 0; then echo_i "failed"; fi
+status=$((status + tmp))
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "testing ixfr-from-differences yes; ($n)"
 tmp=0
 
 echo_i "wait for reloads..."
 wait_for_reloads() (
-	$DIG $DIGOPTS @10.53.0.6 +noall +answer soa primary > dig.out.soa1.ns6.test$n
-	grep "1397051953" dig.out.soa1.ns6.test$n > /dev/null || return 1
-	$DIG $DIGOPTS @10.53.0.1 +noall +answer soa secondary  > dig.out.soa2.ns1.test$n
-	grep "1397051953" dig.out.soa2.ns1.test$n > /dev/null || return 1
-	$DIG $DIGOPTS @10.53.0.2 +noall +answer soa example > dig.out.soa3.ns2.test$n
-	grep "1397051953" dig.out.soa3.ns2.test$n > /dev/null || return 1
-	return 0
+  $DIG $DIGOPTS @10.53.0.6 +noall +answer soa primary >dig.out.soa1.ns6.test$n
+  grep "1397051953" dig.out.soa1.ns6.test$n >/dev/null || return 1
+  $DIG $DIGOPTS @10.53.0.1 +noall +answer soa secondary >dig.out.soa2.ns1.test$n
+  grep "1397051953" dig.out.soa2.ns1.test$n >/dev/null || return 1
+  $DIG $DIGOPTS @10.53.0.2 +noall +answer soa example >dig.out.soa3.ns2.test$n
+  grep "1397051953" dig.out.soa3.ns2.test$n >/dev/null || return 1
+  return 0
 )
 retry_quiet 20 wait_for_reloads || tmp=1
 
 echo_i "wait for transfers..."
 wait_for_transfers() (
-	a=0 b=0 c=0 d=0
-	$DIG $DIGOPTS @10.53.0.3 +noall +answer soa example > dig.out.soa1.ns3.test$n
-	grep "1397051953" dig.out.soa1.ns3.test$n > /dev/null && a=1
-	$DIG $DIGOPTS @10.53.0.3 +noall +answer soa primary > dig.out.soa2.ns3.test$n
-	grep "1397051953" dig.out.soa2.ns3.test$n > /dev/null && b=1
-	$DIG $DIGOPTS @10.53.0.6 +noall +answer soa secondary > dig.out.soa3.ns6.test$n
-	grep "1397051953" dig.out.soa3.ns6.test$n > /dev/null && c=1
-	[ $a -eq 1 -a $b -eq 1 -a $c -eq 1 ] && return 0
-
-	# re-notify if necessary
-	$RNDCCMD 10.53.0.6 notify primary 2>&1 | sed 's/^/ns6 /' | cat_i
-	$RNDCCMD 10.53.0.1 notify secondary 2>&1 | sed 's/^/ns1 /' | cat_i
-	$RNDCCMD 10.53.0.2 notify example 2>&1 | sed 's/^/ns2 /' | cat_i
-	return 1
+  a=0 b=0 c=0 d=0
+  $DIG $DIGOPTS @10.53.0.3 +noall +answer soa example >dig.out.soa1.ns3.test$n
+  grep "1397051953" dig.out.soa1.ns3.test$n >/dev/null && a=1
+  $DIG $DIGOPTS @10.53.0.3 +noall +answer soa primary >dig.out.soa2.ns3.test$n
+  grep "1397051953" dig.out.soa2.ns3.test$n >/dev/null && b=1
+  $DIG $DIGOPTS @10.53.0.6 +noall +answer soa secondary >dig.out.soa3.ns6.test$n
+  grep "1397051953" dig.out.soa3.ns6.test$n >/dev/null && c=1
+  [ $a -eq 1 -a $b -eq 1 -a $c -eq 1 ] && return 0
+
+  # re-notify if necessary
+  $RNDCCMD 10.53.0.6 notify primary 2>&1 | sed 's/^/ns6 /' | cat_i
+  $RNDCCMD 10.53.0.1 notify secondary 2>&1 | sed 's/^/ns1 /' | cat_i
+  $RNDCCMD 10.53.0.2 notify example 2>&1 | sed 's/^/ns2 /' | cat_i
+  return 1
 )
 retry_quiet 20 wait_for_transfers || tmp=1
 
 $DIG $DIGOPTS example. \
-	@10.53.0.3 axfr > dig.out.ns3.test$n || tmp=1
+  @10.53.0.3 axfr >dig.out.ns3.test$n || tmp=1
 grep "^;" dig.out.ns3.test$n | cat_i
 
 digcomp dig2.good dig.out.ns3.test$n || tmp=1
@@ -163,20 +163,20 @@ digcomp dig2.good dig.out.ns3.test$n || tmp=1
 test -f ns3/example.bk || tmp=1
 test -f ns3/example.bk.jnl || tmp=1
 
-if test $tmp != 0 ; then echo_i "failed"; fi
-status=$((status+tmp))
+if test $tmp != 0; then echo_i "failed"; fi
+status=$((status + tmp))
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "testing ixfr-from-differences primary; (primary zone) ($n)"
 tmp=0
 
 $DIG $DIGOPTS primary. \
-	@10.53.0.6 axfr > dig.out.ns6.test$n || tmp=1
+  @10.53.0.6 axfr >dig.out.ns6.test$n || tmp=1
 grep "^;" dig.out.ns6.test$n | cat_i
 
 $DIG $DIGOPTS primary. \
-	@10.53.0.3 axfr > dig.out.ns3.test$n || tmp=1
-grep "^;" dig.out.ns3.test$n > /dev/null && cat_i dig.out.ns3.test$n
+  @10.53.0.3 axfr >dig.out.ns3.test$n || tmp=1
+grep "^;" dig.out.ns3.test$n >/dev/null && cat_i dig.out.ns3.test$n
 
 digcomp dig.out.ns6.test$n dig.out.ns3.test$n || tmp=1
 
@@ -184,19 +184,19 @@ digcomp dig.out.ns6.test$n dig.out.ns3.test$n || tmp=1
 test -f ns3/primary.bk || tmp=1
 test -f ns3/primary.bk.jnl || tmp=1
 
-if test $tmp != 0 ; then echo_i "failed"; fi
-status=$((status+tmp))
+if test $tmp != 0; then echo_i "failed"; fi
+status=$((status + tmp))
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "testing ixfr-from-differences primary; (secondary zone) ($n)"
 tmp=0
 
 $DIG $DIGOPTS secondary. \
-	@10.53.0.6 axfr > dig.out.ns6.test$n || tmp=1
+  @10.53.0.6 axfr >dig.out.ns6.test$n || tmp=1
 grep "^;" dig.out.ns6.test$n | cat_i
 
 $DIG $DIGOPTS secondary. \
-	@10.53.0.1 axfr > dig.out.ns1.test$n || tmp=1
+  @10.53.0.1 axfr >dig.out.ns1.test$n || tmp=1
 grep "^;" dig.out.ns1.test$n | cat_i
 
 digcomp dig.out.ns6.test$n dig.out.ns1.test$n || tmp=1
@@ -205,10 +205,10 @@ digcomp dig.out.ns6.test$n dig.out.ns1.test$n || tmp=1
 test -f ns6/sec.bk || tmp=1
 test -f ns6/sec.bk.jnl && tmp=1
 
-if test $tmp != 0 ; then echo_i "failed"; fi
-status=$((status+tmp))
+if test $tmp != 0; then echo_i "failed"; fi
+status=$((status + tmp))
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "testing ixfr-from-differences secondary; (secondary zone) ($n)"
 tmp=0
 
@@ -216,19 +216,19 @@ tmp=0
 test -f ns7/primary2.db || tmp=1
 test -f ns7/primary2.db.jnl && tmp=1
 
-if test $tmp != 0 ; then echo_i "failed"; fi
-status=$((status+tmp))
+if test $tmp != 0; then echo_i "failed"; fi
+status=$((status + tmp))
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "testing ixfr-from-differences secondary; (secondary zone) ($n)"
 tmp=0
 
 $DIG $DIGOPTS secondary. \
-	@10.53.0.1 axfr > dig.out.ns1.test$n || tmp=1
+  @10.53.0.1 axfr >dig.out.ns1.test$n || tmp=1
 grep "^;" dig.out.ns1.test$n | cat_i
 
 $DIG $DIGOPTS secondary. \
-	@10.53.0.7 axfr > dig.out.ns7.test$n || tmp=1
+  @10.53.0.7 axfr >dig.out.ns7.test$n || tmp=1
 grep "^;" dig.out.ns7.test$n | cat_i
 
 digcomp dig.out.ns7.test$n dig.out.ns1.test$n || tmp=1
@@ -237,16 +237,15 @@ digcomp dig.out.ns7.test$n dig.out.ns1.test$n || tmp=1
 test -f ns7/sec.bk || tmp=1
 test -f ns7/sec.bk.jnl || tmp=1
 
-if test $tmp != 0 ; then echo_i "failed"; fi
-status=$((status+tmp))
+if test $tmp != 0; then echo_i "failed"; fi
+status=$((status + tmp))
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "check that a multi-message uncompressable zone transfers ($n)"
-$DIG axfr . -p ${PORT} @10.53.0.4 | grep SOA > axfr.out
-if test `wc -l < axfr.out` != 2
-then
-	 echo_i "failed"
-         status=$((status+1))
+$DIG axfr . -p ${PORT} @10.53.0.4 | grep SOA >axfr.out
+if test $(wc -l <axfr.out) != 2; then
+  echo_i "failed"
+  status=$((status + 1))
 fi
 
 # now we test transfers with assorted TSIG glitches
@@ -254,10 +253,10 @@ DIGCMD="$DIG $DIGOPTS @10.53.0.4"
 SENDCMD="$PERL ../send.pl 10.53.0.5 $EXTRAPORT1"
 
 echo_i "testing that incorrectly signed transfers will fail..."
-n=$((n+1))
+n=$((n + 1))
 echo_i "initial correctly-signed transfer should succeed ($n)"
 
-$SENDCMD < ans5/goodaxfr
+$SENDCMD <ans5/goodaxfr
 
 # Initially, ns4 is not authoritative for anything.
 # Now that ans is up and running with the right data, we make ns4
@@ -276,120 +275,120 @@ nextpart ns4/named.run >/dev/null
 rndc_reload ns4 10.53.0.4
 
 wait_for_soa() (
-	$DIGCMD nil. SOA > dig.out.ns4.test$n
-	grep SOA dig.out.ns4.test$n > /dev/null
+  $DIGCMD nil. SOA >dig.out.ns4.test$n
+  grep SOA dig.out.ns4.test$n >/dev/null
 )
 retry_quiet 10 wait_for_soa
 
-nextpart ns4/named.run | grep "Transfer status: success" > /dev/null || {
-    echo_i "failed: expected status was not logged"
-    status=$((status+1))
+nextpart ns4/named.run | grep "Transfer status: success" >/dev/null || {
+  echo_i "failed: expected status was not logged"
+  status=$((status + 1))
 }
 
 $DIGCMD nil. TXT | grep 'initial AXFR' >/dev/null || {
-    echo_i "failed"
-    status=$((status+1))
+  echo_i "failed"
+  status=$((status + 1))
 }
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "unsigned transfer ($n)"
 
-$SENDCMD < ans5/unsigned
+$SENDCMD <ans5/unsigned
 
 $RNDCCMD 10.53.0.4 retransfer nil | sed 's/^/ns4 /' | cat_i
 
 sleep 2
 
-nextpart ns4/named.run | grep "Transfer status: expected a TSIG or SIG(0)" > /dev/null || {
-    echo_i "failed: expected status was not logged"
-    status=$((status+1))
+nextpart ns4/named.run | grep "Transfer status: expected a TSIG or SIG(0)" >/dev/null || {
+  echo_i "failed: expected status was not logged"
+  status=$((status + 1))
 }
 
 $DIGCMD nil. TXT | grep 'unsigned AXFR' >/dev/null && {
-    echo_i "failed"
-    status=$((status+1))
+  echo_i "failed"
+  status=$((status + 1))
 }
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "bad keydata ($n)"
 
-$SENDCMD < ans5/badkeydata
+$SENDCMD <ans5/badkeydata
 
 $RNDCCMD 10.53.0.4 retransfer nil | sed 's/^/ns4 /' | cat_i
 
 sleep 2
 
-nextpart ns4/named.run | grep "Transfer status: tsig verify failure" > /dev/null || {
-    echo_i "failed: expected status was not logged"
-    status=$((status+1))
+nextpart ns4/named.run | grep "Transfer status: tsig verify failure" >/dev/null || {
+  echo_i "failed: expected status was not logged"
+  status=$((status + 1))
 }
 
 $DIGCMD nil. TXT | grep 'bad keydata AXFR' >/dev/null && {
-    echo_i "failed"
-    status=$((status+1))
+  echo_i "failed"
+  status=$((status + 1))
 }
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "partially-signed transfer ($n)"
 
-$SENDCMD < ans5/partial
+$SENDCMD <ans5/partial
 
 $RNDCCMD 10.53.0.4 retransfer nil | sed 's/^/ns4 /' | cat_i
 
 sleep 2
 
-nextpart ns4/named.run | grep "Transfer status: expected a TSIG or SIG(0)" > /dev/null || {
-    echo_i "failed: expected status was not logged"
-    status=$((status+1))
+nextpart ns4/named.run | grep "Transfer status: expected a TSIG or SIG(0)" >/dev/null || {
+  echo_i "failed: expected status was not logged"
+  status=$((status + 1))
 }
 
 $DIGCMD nil. TXT | grep 'partially signed AXFR' >/dev/null && {
-    echo_i "failed"
-    status=$((status+1))
+  echo_i "failed"
+  status=$((status + 1))
 }
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "unknown key ($n)"
 
-$SENDCMD < ans5/unknownkey
+$SENDCMD <ans5/unknownkey
 
 $RNDCCMD 10.53.0.4 retransfer nil | sed 's/^/ns4 /' | cat_i
 
 sleep 2
 
-nextpart ns4/named.run | grep "tsig key 'tsig_key': key name and algorithm do not match" > /dev/null || {
-    echo_i "failed: expected status was not logged"
-    status=$((status+1))
+nextpart ns4/named.run | grep "tsig key 'tsig_key': key name and algorithm do not match" >/dev/null || {
+  echo_i "failed: expected status was not logged"
+  status=$((status + 1))
 }
 
 $DIGCMD nil. TXT | grep 'unknown key AXFR' >/dev/null && {
-    echo_i "failed"
-    status=$((status+1))
+  echo_i "failed"
+  status=$((status + 1))
 }
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "incorrect key ($n)"
 
-$SENDCMD < ans5/wrongkey
+$SENDCMD <ans5/wrongkey
 
 $RNDCCMD 10.53.0.4 retransfer nil | sed 's/^/ns4 /' | cat_i
 
 sleep 2
 
-nextpart ns4/named.run | grep "tsig key 'tsig_key': key name and algorithm do not match" > /dev/null || {
-    echo_i "failed: expected status was not logged"
-    status=$((status+1))
+nextpart ns4/named.run | grep "tsig key 'tsig_key': key name and algorithm do not match" >/dev/null || {
+  echo_i "failed: expected status was not logged"
+  status=$((status + 1))
 }
 
 $DIGCMD nil. TXT | grep 'incorrect key AXFR' >/dev/null && {
-    echo_i "failed"
-    status=$((status+1))
+  echo_i "failed"
+  status=$((status + 1))
 }
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "bad message id ($n)"
 
-$SENDCMD < ans5/badmessageid
+$SENDCMD <ans5/badmessageid
 
 # Uncomment to see AXFR stream with mismatching IDs.
 # $DIG $DIGOPTS @10.53.0.5 -y tsig_key:LSAnCU+Z nil. AXFR +all
@@ -399,97 +398,97 @@ $RNDCCMD 10.53.0.4 retransfer nil | sed 's/^/ns4 /' | cat_i
 sleep 2
 
 msg="detected message ID mismatch on incoming AXFR stream, transfer will fail in BIND 9.17.2 and later if AXFR source is not fixed"
-nextpart ns4/named.run | grep "$msg" > /dev/null || {
-    echo_i "failed: expected status was not logged"
-    status=$((status+1))
+nextpart ns4/named.run | grep "$msg" >/dev/null || {
+  echo_i "failed: expected status was not logged"
+  status=$((status + 1))
 }
 
 $DIGCMD nil. TXT | grep 'bad message id' >/dev/null || {
-    echo_i "failed"
-    status=$((status+1))
+  echo_i "failed"
+  status=$((status + 1))
 }
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "mismatched SOA ($n)"
 
-${SENDCMD} < ans5/soamismatch
+${SENDCMD} <ans5/soamismatch
 
 $RNDCCMD 10.53.0.4 retransfer nil | sed 's/^/ns4 /' | cat_i
 
 sleep 2
 
-nextpart ns4/named.run | grep "Transfer status: FORMERR" > /dev/null || {
-    echo_i "failed: expected status was not logged"
-    status=$((status+1))
+nextpart ns4/named.run | grep "Transfer status: FORMERR" >/dev/null || {
+  echo_i "failed: expected status was not logged"
+  status=$((status + 1))
 }
 
 $DIGCMD nil. TXT | grep 'SOA mismatch AXFR' >/dev/null && {
-    echo_i "failed"
-    status=$((status+1))
+  echo_i "failed"
+  status=$((status + 1))
 }
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "check that we ask for and get a EDNS EXPIRE response ($n)"
 # force a refresh query
 $RNDCCMD 10.53.0.7 refresh edns-expire 2>&1 | sed 's/^/ns7 /' | cat_i
 sleep 10
 
 # there may be multiple log entries so get the last one.
-expire=`awk '/edns-expire\/IN: got EDNS EXPIRE of/ { x=$9 } END { print x }' ns7/named.run`
+expire=$(awk '/edns-expire\/IN: got EDNS EXPIRE of/ { x=$9 } END { print x }' ns7/named.run)
 test ${expire:-0} -gt 0 -a ${expire:-0} -lt 1814400 || {
-    echo_i "failed (expire=${expire:-0})"
-    status=$((status+1))
+  echo_i "failed (expire=${expire:-0})"
+  status=$((status + 1))
 }
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "test smaller transfer TCP message size ($n)"
 $DIG $DIGOPTS example. @10.53.0.8 axfr \
-	-y key1.:1234abcd8765 > dig.out.msgsize.test$n || status=1
+  -y key1.:1234abcd8765 >dig.out.msgsize.test$n || status=1
 
 $DOS2UNIX dig.out.msgsize.test$n >/dev/null 2>&1
 
-bytes=`wc -c < dig.out.msgsize.test$n`
+bytes=$(wc -c <dig.out.msgsize.test$n)
 if [ $bytes -ne 459357 ]; then
-	echo_i "failed axfr size check"
-        status=$((status+1))
+  echo_i "failed axfr size check"
+  status=$((status + 1))
 fi
 
-num_messages=`cat ns8/named.run | grep "sending TCP message of" | wc -l`
+num_messages=$(cat ns8/named.run | grep "sending TCP message of" | wc -l)
 if [ $num_messages -le 300 ]; then
-	echo_i "failed transfer message count check"
-        status=$((status+1))
+  echo_i "failed transfer message count check"
+  status=$((status + 1))
 fi
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "test mapped zone with out of zone data ($n)"
 tmp=0
-$DIG -p ${PORT} txt mapped @10.53.0.3 > dig.out.1.test$n
-grep "status: NOERROR," dig.out.1.test$n > /dev/null || tmp=1
+$DIG -p ${PORT} txt mapped @10.53.0.3 >dig.out.1.test$n
+grep "status: NOERROR," dig.out.1.test$n >/dev/null || tmp=1
 stop_server ns3
 start_server --noclean --restart --port ${PORT} ns3
-check_mapped () {
-	$DIG -p ${PORT} txt mapped @10.53.0.3 > dig.out.2.test$n
-	grep "status: NOERROR," dig.out.2.test$n > /dev/null || return 1
-	$DIG -p ${PORT} axfr mapped @10.53.0.3 > dig.out.3.test$n
-	digcomp knowngood.mapped dig.out.3.test$n || return 1
-	return 0
+check_mapped() {
+  $DIG -p ${PORT} txt mapped @10.53.0.3 >dig.out.2.test$n
+  grep "status: NOERROR," dig.out.2.test$n >/dev/null || return 1
+  $DIG -p ${PORT} axfr mapped @10.53.0.3 >dig.out.3.test$n
+  digcomp knowngood.mapped dig.out.3.test$n || return 1
+  return 0
 }
 retry_quiet 10 check_mapped || tmp=1
 [ "$tmp" -ne 0 ] && echo_i "failed"
-status=$((status+tmp))
+status=$((status + tmp))
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "test that a zone with too many records is rejected (AXFR) ($n)"
 tmp=0
 grep "'axfr-too-big/IN'.*: too many records" ns6/named.run >/dev/null || tmp=1
-if test $tmp != 0 ; then echo_i "failed"; fi
-status=$((status+tmp))
+if test $tmp != 0; then echo_i "failed"; fi
+status=$((status + tmp))
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "test that a zone with too many records is rejected (IXFR) ($n)"
 tmp=0
-nextpart ns6/named.run > /dev/null
-$NSUPDATE << EOF
+nextpart ns6/named.run >/dev/null
+$NSUPDATE <<EOF
 zone ixfr-too-big
 server 10.53.0.1 ${PORT}
 update add the-31st-record.ixfr-too-big 0 TXT this is it
@@ -497,10 +496,10 @@ send
 EOF
 msg="'ixfr-too-big/IN' from 10.53.0.1#${PORT}: Transfer status: too many records"
 wait_for_log 10 "$msg" ns6/named.run || tmp=1
-if test $tmp != 0 ; then echo_i "failed"; fi
-status=$((status+tmp))
+if test $tmp != 0; then echo_i "failed"; fi
+status=$((status + tmp))
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "checking whether dig calculates AXFR statistics correctly ($n)"
 tmp=0
 # Loop until the secondary server manages to transfer the "xfer-stats" zone so
@@ -508,40 +507,40 @@ tmp=0
 # Use -b so that we can discern between incoming and outgoing transfers in ns3
 # logs later on.
 wait_for_xfer() (
-	$DIG $DIGOPTS +noedns +stat -b 10.53.0.2 @10.53.0.3 xfer-stats. AXFR > dig.out.ns3.test$n
-	grep "; Transfer failed" dig.out.ns3.test$n > /dev/null || return 0
-	return 1
+  $DIG $DIGOPTS +noedns +stat -b 10.53.0.2 @10.53.0.3 xfer-stats. AXFR >dig.out.ns3.test$n
+  grep "; Transfer failed" dig.out.ns3.test$n >/dev/null || return 0
+  return 1
 )
 if retry_quiet 10 wait_for_xfer; then
-	get_dig_xfer_stats dig.out.ns3.test$n > stats.dig
-	diff axfr-stats.good stats.dig || tmp=1
+  get_dig_xfer_stats dig.out.ns3.test$n >stats.dig
+  diff axfr-stats.good stats.dig || tmp=1
 else
-	echo_i "timed out waiting for zone transfer"
+  echo_i "timed out waiting for zone transfer"
 fi
-if test $tmp != 0 ; then echo_i "failed"; fi
-status=$((status+tmp))
+if test $tmp != 0; then echo_i "failed"; fi
+status=$((status + tmp))
 
 # Note: in the next two tests, we use ns3 logs for checking both incoming and
 # outgoing transfer statistics as ns3 is both a secondary server (for ns1) and a
 # primary server (for dig queries from the previous test) for "xfer-stats".
-n=$((n+1))
+n=$((n + 1))
 echo_i "checking whether named calculates incoming AXFR statistics correctly ($n)"
 tmp=0
-get_named_xfer_stats ns3/named.run 10.53.0.1 xfer-stats "Transfer completed" > stats.incoming
+get_named_xfer_stats ns3/named.run 10.53.0.1 xfer-stats "Transfer completed" >stats.incoming
 diff axfr-stats.good stats.incoming || tmp=1
-if test $tmp != 0 ; then echo_i "failed"; fi
-status=$((status+tmp))
+if test $tmp != 0; then echo_i "failed"; fi
+status=$((status + tmp))
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "checking whether named calculates outgoing AXFR statistics correctly ($n)"
 tmp=0
 check_xfer_stats() {
-	get_named_xfer_stats ns3/named.run 10.53.0.2 xfer-stats "AXFR ended" > stats.outgoing
-	diff axfr-stats.good stats.outgoing > /dev/null
+  get_named_xfer_stats ns3/named.run 10.53.0.2 xfer-stats "AXFR ended" >stats.outgoing
+  diff axfr-stats.good stats.outgoing >/dev/null
 }
 retry_quiet 10 check_xfer_stats || tmp=1
-if test $tmp != 0 ; then echo_i "failed"; fi
-status=$((status+tmp))
+if test $tmp != 0; then echo_i "failed"; fi
+status=$((status + tmp))
 
 echo_i "exit status: $status"
 [ $status -eq 0 ] || exit 1