Merging upstream version 1:9.16.48.

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

3 files changed, 620 insertions, 628 deletions

diff --git a/bin/tests/system/digdelv/ns2/sign.sh b/bin/tests/system/digdelv/ns2/sign.sh
index 41dacd6..8abe561 100644
--- a/bin/tests/system/digdelv/ns2/sign.sh
+++ b/bin/tests/system/digdelv/ns2/sign.sh
@@ -20,10 +20,10 @@ ksk=$("$KEYGEN" -q -a "$DEFAULT_ALGORITHM" -b "$DEFAULT_BITS" -n zone example.)
 
 cp example.db.in example.db
 
-"$SIGNER" -Sz -f example.db -o example example.db.in > /dev/null 2>&1
+"$SIGNER" -Sz -f example.db -o example example.db.in >/dev/null 2>&1
 
-keyfile_to_key_id "$ksk" > keyid
-grep -Ev '^;' < "$ksk.key" | cut -f 7- -d ' ' > keydata
+keyfile_to_key_id "$ksk" >keyid
+grep -Ev '^;' <"$ksk.key" | cut -f 7- -d ' ' >keydata
 
-keyfile_to_initial_keys "$ksk" > ../ns3/anchor.dnskey
-keyfile_to_initial_ds "$ksk" > ../ns3/anchor.ds
+keyfile_to_initial_keys "$ksk" >../ns3/anchor.dnskey
+keyfile_to_initial_ds "$ksk" >../ns3/anchor.ds
diff --git a/bin/tests/system/digdelv/prereq.sh b/bin/tests/system/digdelv/prereq.sh
index 8f5a385..5e82909 100644
--- a/bin/tests/system/digdelv/prereq.sh
+++ b/bin/tests/system/digdelv/prereq.sh
@@ -16,10 +16,9 @@
 
 set -e
 
-if $PERL -e 'use Net::DNS;' 2>/dev/null
-then
-    :
+if $PERL -e 'use Net::DNS;' 2>/dev/null; then
+  :
 else
-    echo_i "This test requires the Net::DNS library." >&2
-    exit 1
+  echo_i "This test requires the Net::DNS library." >&2
+  exit 1
 fi
diff --git a/bin/tests/system/digdelv/tests.sh b/bin/tests/system/digdelv/tests.sh
index 470f230..fd7b383 100644
--- a/bin/tests/system/digdelv/tests.sh
+++ b/bin/tests/system/digdelv/tests.sh
@@ -21,15 +21,15 @@ status=0
 n=0
 
 sendcmd() {
-    "$PERL" "$SYSTEMTESTTOP/send.pl" "${1}" "$EXTRAPORT1"
+  "$PERL" "$SYSTEMTESTTOP/send.pl" "${1}" "$EXTRAPORT1"
 }
 
 dig_with_opts() {
-    "$DIG" -p "$PORT" "$@"
+  "$DIG" -p "$PORT" "$@"
 }
 
 mdig_with_opts() {
-    "$MDIG" -p "$PORT" "$@"
+  "$MDIG" -p "$PORT" "$@"
 }
 
 # Check if response in file $1 has the correct TTL range.
@@ -38,212 +38,211 @@ mdig_with_opts() {
 # the second word on the line.  TTL position can be adjusted with
 # setting the position $4, but that requires updating this function.
 check_ttl_range() {
-    file=$1
-    pos=$4
+  file=$1
+  pos=$4
 
-    case "$pos" in
+  case "$pos" in
     "3")
-    awk -v rrtype="$2" -v ttl="$3" '($4 == "IN" || $4 == "CLASS1" ) && $5 == rrtype { if ($3 <= ttl) { ok=1 } } END { exit(ok?0:1) }' < $file
-    ;;
+      awk -v rrtype="$2" -v ttl="$3" '($4 == "IN" || $4 == "CLASS1" ) && $5 == rrtype { if ($3 <= ttl) { ok=1 } } END { exit(ok?0:1) }' <$file
+      ;;
     *)
-    awk -v rrtype="$2" -v ttl="$3" '($3 == "IN" || $3 == "CLASS1" ) && $4 == rrtype { if ($2 <= ttl) { ok=1 } } END { exit(ok?0:1) }' < $file
-    ;;
-    esac
+      awk -v rrtype="$2" -v ttl="$3" '($3 == "IN" || $3 == "CLASS1" ) && $4 == rrtype { if ($2 <= ttl) { ok=1 } } END { exit(ok?0:1) }' <$file
+      ;;
+  esac
 
-   result=$?
-   [ $result -eq 0 ] || echo_i "ttl check failed"
-   return $result
+  result=$?
+  [ $result -eq 0 ] || echo_i "ttl check failed"
+  return $result
 }
 
 # using delv insecure mode as not testing dnssec here
 delv_with_opts() {
-    "$DELV" +noroot -p "$PORT" "$@"
+  "$DELV" +noroot -p "$PORT" "$@"
 }
 
 KEYID="$(cat ns2/keyid)"
-KEYDATA="$(< ns2/keydata sed -e 's/+/[+]/g')"
-NOSPLIT="$(< ns2/keydata sed -e 's/+/[+]/g' -e 's/ //g')"
+KEYDATA="$(sed <ns2/keydata -e 's/+/[+]/g')"
+NOSPLIT="$(sed <ns2/keydata -e 's/+/[+]/g' -e 's/ //g')"
 
 HAS_PYYAML=0
-if [ -n "$PYTHON" ] ; then
-	$PYTHON -c "import yaml" 2> /dev/null && HAS_PYYAML=1
+if [ -n "$PYTHON" ]; then
+  $PYTHON -c "import yaml" 2>/dev/null && HAS_PYYAML=1
 fi
 
 #
 # test whether ans7/ans.pl will be able to send a UPDATE response.
 # if it can't, we will log that below.
 #
-if "$PERL" -e 'use Net::DNS; use Net::DNS::Packet; my $p = new Net::DNS::Packet; $p->header->opcode(5);' > /dev/null 2>&1
-then
-	checkupdate=1
+if "$PERL" -e 'use Net::DNS; use Net::DNS::Packet; my $p = new Net::DNS::Packet; $p->header->opcode(5);' >/dev/null 2>&1; then
+  checkupdate=1
 else
-	checkupdate=0
+  checkupdate=0
 fi
 
-if [ -x "$NSLOOKUP" -a $checkupdate -eq 1 ] ; then
+if [ -x "$NSLOOKUP" -a $checkupdate -eq 1 ]; then
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "check nslookup handles UPDATE response ($n)"
   ret=0
-  "$NSLOOKUP" -q=CNAME "-port=$PORT" foo.bar 10.53.0.7 > nslookup.out.test$n 2>&1 && ret=1
-  grep "Opcode mismatch" nslookup.out.test$n > /dev/null || ret=1
+  "$NSLOOKUP" -q=CNAME "-port=$PORT" foo.bar 10.53.0.7 >nslookup.out.test$n 2>&1 && ret=1
+  grep "Opcode mismatch" nslookup.out.test$n >/dev/null || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
 fi
 
-if [ -x "$HOST" -a $checkupdate -eq 1 ] ; then
+if [ -x "$HOST" -a $checkupdate -eq 1 ]; then
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "check host handles UPDATE response ($n)"
   ret=0
-  "$HOST" -t CNAME -p $PORT foo.bar 10.53.0.7 > host.out.test$n 2>&1 && ret=1
-  grep "Opcode mismatch" host.out.test$n > /dev/null || ret=1
+  "$HOST" -t CNAME -p $PORT foo.bar 10.53.0.7 >host.out.test$n 2>&1 && ret=1
+  grep "Opcode mismatch" host.out.test$n >/dev/null || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
 fi
 
-if [ -x "$NSUPDATE" -a $checkupdate -eq 1 ] ; then
+if [ -x "$NSUPDATE" -a $checkupdate -eq 1 ]; then
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "check nsupdate handles UPDATE response to QUERY ($n)"
   ret=0
   res=0
-  $NSUPDATE << EOF > nsupdate.out.test$n 2>&1 || res=$?
+  $NSUPDATE <<EOF >nsupdate.out.test$n 2>&1 || res=$?
 server 10.53.0.7 ${PORT}
 add x.example.com 300 in a 1.2.3.4
 send
 EOF
   test $res -eq 1 || ret=1
-  grep "invalid OPCODE in response to SOA query" nsupdate.out.test$n > /dev/null || ret=1
+  grep "invalid OPCODE in response to SOA query" nsupdate.out.test$n >/dev/null || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
 fi
 
-if [ -x "$DIG" ] ; then
+if [ -x "$DIG" ]; then
 
-  if [ $checkupdate -eq 1 ] ; then
+  if [ $checkupdate -eq 1 ]; then
 
-    n=$((n+1))
+    n=$((n + 1))
     echo_i "check dig handles UPDATE response ($n)"
     ret=0
-    dig_with_opts @10.53.0.7 cname foo.bar > dig.out.test$n 2>&1 && ret=1
-    grep "Opcode mismatch" dig.out.test$n > /dev/null || ret=1
+    dig_with_opts @10.53.0.7 cname foo.bar >dig.out.test$n 2>&1 && ret=1
+    grep "Opcode mismatch" dig.out.test$n >/dev/null || ret=1
     if [ $ret -ne 0 ]; then echo_i "failed"; fi
-    status=$((status+ret))
+    status=$((status + ret))
   else
     echo_i "Skipped UPDATE handling test"
   fi
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking dig short form works ($n)"
   ret=0
-  dig_with_opts @10.53.0.3 +short a a.example > dig.out.test$n || ret=1
-  test "$(wc -l < dig.out.test$n)" -eq 1 || ret=1
+  dig_with_opts @10.53.0.3 +short a a.example >dig.out.test$n || ret=1
+  test "$(wc -l <dig.out.test$n)" -eq 1 || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking dig split width works ($n)"
   ret=0
-  dig_with_opts @10.53.0.3 +split=4 -t sshfp foo.example > dig.out.test$n || ret=1
-  grep " 9ABC DEF6 7890 " < dig.out.test$n > /dev/null || ret=1
+  dig_with_opts @10.53.0.3 +split=4 -t sshfp foo.example >dig.out.test$n || ret=1
+  grep " 9ABC DEF6 7890 " <dig.out.test$n >/dev/null || ret=1
   check_ttl_range dig.out.test$n "SSHFP" 300 || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking dig +unknownformat works ($n)"
   ret=0
-  dig_with_opts @10.53.0.3 +unknownformat a a.example > dig.out.test$n || ret=1
-  grep "CLASS1[ 	][ 	]*TYPE1[ 	][ 	]*\\\\# 4 0A000001" < dig.out.test$n > /dev/null || ret=1
+  dig_with_opts @10.53.0.3 +unknownformat a a.example >dig.out.test$n || ret=1
+  grep "CLASS1[ 	][ 	]*TYPE1[ 	][ 	]*\\\\# 4 0A000001" <dig.out.test$n >/dev/null || ret=1
   check_ttl_range dig.out.test$n "TYPE1" 300 || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking dig with reverse lookup works ($n)"
   ret=0
-  dig_with_opts @10.53.0.3 -x 127.0.0.1 > dig.out.test$n 2>&1 || ret=1
+  dig_with_opts @10.53.0.3 -x 127.0.0.1 >dig.out.test$n 2>&1 || ret=1
   # doesn't matter if has answer
-  grep -i "127\\.in-addr\\.arpa\\." < dig.out.test$n > /dev/null || ret=1
+  grep -i "127\\.in-addr\\.arpa\\." <dig.out.test$n >/dev/null || ret=1
   check_ttl_range dig.out.test$n "SOA" 86400 || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking dig over TCP works ($n)"
   ret=0
-  dig_with_opts +tcp @10.53.0.3 a a.example > dig.out.test$n || ret=1
-  grep "10\\.0\\.0\\.1$" < dig.out.test$n > /dev/null || ret=1
+  dig_with_opts +tcp @10.53.0.3 a a.example >dig.out.test$n || ret=1
+  grep "10\\.0\\.0\\.1$" <dig.out.test$n >/dev/null || ret=1
   check_ttl_range dig.out.test$n "A" 300 || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking dig +multi +norrcomments works for DNSKEY (when default is rrcomments)($n)"
   ret=0
-  dig_with_opts +tcp @10.53.0.3 +multi +norrcomments -t DNSKEY example > dig.out.test$n || ret=1
-  grep "; ZSK; alg = $DEFAULT_ALGORITHM ; key id = $KEYID" dig.out.test$n > /dev/null && ret=1
+  dig_with_opts +tcp @10.53.0.3 +multi +norrcomments -t DNSKEY example >dig.out.test$n || ret=1
+  grep "; ZSK; alg = $DEFAULT_ALGORITHM ; key id = $KEYID" dig.out.test$n >/dev/null && ret=1
   check_ttl_range dig.out.test$n "DNSKEY" 300 || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking dig +multi +norrcomments works for SOA (when default is rrcomments)($n)"
   ret=0
-  dig_with_opts +tcp @10.53.0.3 +multi +norrcomments -t SOA example > dig.out.test$n || ret=1
-  grep "; serial" dig.out.test$n > /dev/null && ret=1
+  dig_with_opts +tcp @10.53.0.3 +multi +norrcomments -t SOA example >dig.out.test$n || ret=1
+  grep "; serial" dig.out.test$n >/dev/null && ret=1
   check_ttl_range dig.out.test$n "SOA" 300 || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking dig +rrcomments works for DNSKEY($n)"
   ret=0
-  dig_with_opts +tcp @10.53.0.3 +rrcomments DNSKEY example > dig.out.test$n || ret=1
-  grep "; ZSK; alg = $DEFAULT_ALGORITHM ; key id = $KEYID" < dig.out.test$n > /dev/null || ret=1
+  dig_with_opts +tcp @10.53.0.3 +rrcomments DNSKEY example >dig.out.test$n || ret=1
+  grep "; ZSK; alg = $DEFAULT_ALGORITHM ; key id = $KEYID" <dig.out.test$n >/dev/null || ret=1
   check_ttl_range dig.out.test$n "DNSKEY" 300 || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking dig +short +rrcomments works for DNSKEY ($n)"
   ret=0
-  dig_with_opts +tcp @10.53.0.3 +short +rrcomments DNSKEY example > dig.out.test$n || ret=1
-  grep "; ZSK; alg = $DEFAULT_ALGORITHM ; key id = $KEYID" < dig.out.test$n > /dev/null || ret=1
+  dig_with_opts +tcp @10.53.0.3 +short +rrcomments DNSKEY example >dig.out.test$n || ret=1
+  grep "; ZSK; alg = $DEFAULT_ALGORITHM ; key id = $KEYID" <dig.out.test$n >/dev/null || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking dig +short +nosplit works($n)"
   ret=0
-  dig_with_opts +tcp @10.53.0.3 +short +nosplit DNSKEY example > dig.out.test$n || ret=1
-  grep "$NOSPLIT" < dig.out.test$n > /dev/null || ret=1
+  dig_with_opts +tcp @10.53.0.3 +short +nosplit DNSKEY example >dig.out.test$n || ret=1
+  grep "$NOSPLIT" <dig.out.test$n >/dev/null || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking dig +short +rrcomments works($n)"
   ret=0
-  dig_with_opts +tcp @10.53.0.3 +short +rrcomments DNSKEY example > dig.out.test$n || ret=1
-  grep -q "$KEYDATA  ; ZSK; alg = $DEFAULT_ALGORITHM ; key id = $KEYID\$" < dig.out.test$n || ret=1
+  dig_with_opts +tcp @10.53.0.3 +short +rrcomments DNSKEY example >dig.out.test$n || ret=1
+  grep -q "$KEYDATA  ; ZSK; alg = $DEFAULT_ALGORITHM ; key id = $KEYID\$" <dig.out.test$n || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking dig multi flag is local($n)"
   ret=0
-  dig_with_opts +tcp @10.53.0.3 -t DNSKEY example +nomulti example +nomulti > dig.out.nn.$n || ret=1
-  dig_with_opts +tcp @10.53.0.3 -t DNSKEY example +multi example +nomulti > dig.out.mn.$n || ret=1
-  dig_with_opts +tcp @10.53.0.3 -t DNSKEY example +nomulti example +multi > dig.out.nm.$n || ret=1
-  dig_with_opts +tcp @10.53.0.3 -t DNSKEY example +multi example +multi > dig.out.mm.$n || ret=1
-  lcnn=$(wc -l < dig.out.nn.$n)
-  lcmn=$(wc -l < dig.out.mn.$n)
-  lcnm=$(wc -l < dig.out.nm.$n)
-  lcmm=$(wc -l < dig.out.mm.$n)
+  dig_with_opts +tcp @10.53.0.3 -t DNSKEY example +nomulti example +nomulti >dig.out.nn.$n || ret=1
+  dig_with_opts +tcp @10.53.0.3 -t DNSKEY example +multi example +nomulti >dig.out.mn.$n || ret=1
+  dig_with_opts +tcp @10.53.0.3 -t DNSKEY example +nomulti example +multi >dig.out.nm.$n || ret=1
+  dig_with_opts +tcp @10.53.0.3 -t DNSKEY example +multi example +multi >dig.out.mm.$n || ret=1
+  lcnn=$(wc -l <dig.out.nn.$n)
+  lcmn=$(wc -l <dig.out.mn.$n)
+  lcnm=$(wc -l <dig.out.nm.$n)
+  lcmm=$(wc -l <dig.out.mm.$n)
   test "$lcmm" -ge "$lcnm" || ret=1
   test "$lcmm" -ge "$lcmn" || ret=1
   test "$lcnm" -ge "$lcnn" || ret=1
@@ -253,689 +252,685 @@ if [ -x "$DIG" ] ; then
   check_ttl_range dig.out.nm.$n "DNSKEY" 300 || ret=1
   check_ttl_range dig.out.mm.$n "DNSKEY" 300 || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking dig +noheader-only works ($n)"
   ret=0
-  dig_with_opts +tcp @10.53.0.3 +noheader-only A example > dig.out.test$n || ret=1
-  grep "Got answer:" < dig.out.test$n > /dev/null || ret=1
+  dig_with_opts +tcp @10.53.0.3 +noheader-only A example >dig.out.test$n || ret=1
+  grep "Got answer:" <dig.out.test$n >/dev/null || ret=1
   check_ttl_range dig.out.test$n "SOA" 300 || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking dig +short +rrcomments works($n)"
   ret=0
-  dig_with_opts +tcp @10.53.0.3 +short +rrcomments DNSKEY example > dig.out.test$n || ret=1
-  grep -q "$KEYDATA  ; ZSK; alg = $DEFAULT_ALGORITHM ; key id = $KEYID\$" < dig.out.test$n || ret=1
+  dig_with_opts +tcp @10.53.0.3 +short +rrcomments DNSKEY example >dig.out.test$n || ret=1
+  grep -q "$KEYDATA  ; ZSK; alg = $DEFAULT_ALGORITHM ; key id = $KEYID\$" <dig.out.test$n || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking dig +header-only works ($n)"
   ret=0
-  dig_with_opts +tcp @10.53.0.3 +header-only example > dig.out.test$n || ret=1
-  grep "^;; flags: qr rd; QUERY: 0, ANSWER: 0," < dig.out.test$n > /dev/null || ret=1
-  grep "^;; QUESTION SECTION:" < dig.out.test$n > /dev/null && ret=1
+  dig_with_opts +tcp @10.53.0.3 +header-only example >dig.out.test$n || ret=1
+  grep "^;; flags: qr rd; QUERY: 0, ANSWER: 0," <dig.out.test$n >/dev/null || ret=1
+  grep "^;; QUESTION SECTION:" <dig.out.test$n >/dev/null && ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking dig +raflag works ($n)"
   ret=0
-  dig_with_opts +tcp @10.53.0.3 +raflag +qr example > dig.out.test$n || ret=1
-  grep "^;; flags: rd ra ad; QUERY: 1, ANSWER: 0," < dig.out.test$n > /dev/null || ret=1
-  grep "^;; flags: qr rd ra; QUERY: 1, ANSWER: 0," < dig.out.test$n > /dev/null || ret=1
+  dig_with_opts +tcp @10.53.0.3 +raflag +qr example >dig.out.test$n || ret=1
+  grep "^;; flags: rd ra ad; QUERY: 1, ANSWER: 0," <dig.out.test$n >/dev/null || ret=1
+  grep "^;; flags: qr rd ra; QUERY: 1, ANSWER: 0," <dig.out.test$n >/dev/null || ret=1
   check_ttl_range dig.out.test$n "SOA" 300 || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking dig +tcflag works ($n)"
   ret=0
-  dig_with_opts +tcp @10.53.0.3 +tcflag +qr example > dig.out.test$n || ret=1
-  grep "^;; flags: tc rd ad; QUERY: 1, ANSWER: 0" < dig.out.test$n > /dev/null || ret=1
-  grep "^;; flags: qr rd ra; QUERY: 1, ANSWER: 0," < dig.out.test$n > /dev/null || ret=1
+  dig_with_opts +tcp @10.53.0.3 +tcflag +qr example >dig.out.test$n || ret=1
+  grep "^;; flags: tc rd ad; QUERY: 1, ANSWER: 0" <dig.out.test$n >/dev/null || ret=1
+  grep "^;; flags: qr rd ra; QUERY: 1, ANSWER: 0," <dig.out.test$n >/dev/null || ret=1
   check_ttl_range dig.out.test$n "SOA" 300 || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking dig +header-only works (with class and type set) ($n)"
   ret=0
-  dig_with_opts +tcp @10.53.0.3 +header-only -c IN -t A example > dig.out.test$n || ret=1
-  grep "^;; flags: qr rd; QUERY: 0, ANSWER: 0," < dig.out.test$n > /dev/null || ret=1
-  grep "^;; QUESTION SECTION:" < dig.out.test$n > /dev/null && ret=1
+  dig_with_opts +tcp @10.53.0.3 +header-only -c IN -t A example >dig.out.test$n || ret=1
+  grep "^;; flags: qr rd; QUERY: 0, ANSWER: 0," <dig.out.test$n >/dev/null || ret=1
+  grep "^;; QUESTION SECTION:" <dig.out.test$n >/dev/null && ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking dig +zflag works, and that BIND properly ignores it ($n)"
   ret=0
-  dig_with_opts +tcp @10.53.0.3 +zflag +qr A example > dig.out.test$n || ret=1
-  sed -n '/Sending:/,/Got answer:/p' dig.out.test$n | grep "^;; flags: rd ad; MBZ: 0x4;" > /dev/null || ret=1
-  sed -n '/Got answer:/,/AUTHORITY SECTION:/p' dig.out.test$n | grep "^;; flags: qr rd ra; QUERY: 1" > /dev/null || ret=1
+  dig_with_opts +tcp @10.53.0.3 +zflag +qr A example >dig.out.test$n || ret=1
+  sed -n '/Sending:/,/Got answer:/p' dig.out.test$n | grep "^;; flags: rd ad; MBZ: 0x4;" >/dev/null || ret=1
+  sed -n '/Got answer:/,/AUTHORITY SECTION:/p' dig.out.test$n | grep "^;; flags: qr rd ra; QUERY: 1" >/dev/null || ret=1
   check_ttl_range dig.out.test$n "SOA" 300 || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking dig +qr +ednsopt=08 does not cause an INSIST failure ($n)"
   ret=0
-  dig_with_opts @10.53.0.3 +ednsopt=08 +qr a a.example > dig.out.test$n || ret=1
-  grep "INSIST" < dig.out.test$n > /dev/null && ret=1
-  grep "FORMERR" < dig.out.test$n > /dev/null || ret=1
+  dig_with_opts @10.53.0.3 +ednsopt=08 +qr a a.example >dig.out.test$n || ret=1
+  grep "INSIST" <dig.out.test$n >/dev/null && ret=1
+  grep "FORMERR" <dig.out.test$n >/dev/null || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking dig +ttlunits works ($n)"
   ret=0
-  dig_with_opts +tcp @10.53.0.2 +ttlunits A weeks.example > dig.out.test$n || ret=1
-  grep "^weeks.example.		3w" < dig.out.test$n > /dev/null || ret=1
-  dig_with_opts +tcp @10.53.0.2 +ttlunits A days.example > dig.out.test$n || ret=1
-  grep "^days.example.		3d" < dig.out.test$n > /dev/null || ret=1
-  dig_with_opts +tcp @10.53.0.2 +ttlunits A hours.example > dig.out.test$n || ret=1
-  grep "^hours.example.		3h" < dig.out.test$n > /dev/null || ret=1
-  dig_with_opts +tcp @10.53.0.2 +ttlunits A minutes.example > dig.out.test$n || ret=1
-  grep "^minutes.example.	45m" < dig.out.test$n > /dev/null || ret=1
-  dig_with_opts +tcp @10.53.0.2 +ttlunits A seconds.example > dig.out.test$n || ret=1
-  grep "^seconds.example.	45s" < dig.out.test$n > /dev/null || ret=1
+  dig_with_opts +tcp @10.53.0.2 +ttlunits A weeks.example >dig.out.test$n || ret=1
+  grep "^weeks.example.		3w" <dig.out.test$n >/dev/null || ret=1
+  dig_with_opts +tcp @10.53.0.2 +ttlunits A days.example >dig.out.test$n || ret=1
+  grep "^days.example.		3d" <dig.out.test$n >/dev/null || ret=1
+  dig_with_opts +tcp @10.53.0.2 +ttlunits A hours.example >dig.out.test$n || ret=1
+  grep "^hours.example.		3h" <dig.out.test$n >/dev/null || ret=1
+  dig_with_opts +tcp @10.53.0.2 +ttlunits A minutes.example >dig.out.test$n || ret=1
+  grep "^minutes.example.	45m" <dig.out.test$n >/dev/null || ret=1
+  dig_with_opts +tcp @10.53.0.2 +ttlunits A seconds.example >dig.out.test$n || ret=1
+  grep "^seconds.example.	45s" <dig.out.test$n >/dev/null || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking dig respects precedence of options with +ttlunits ($n)"
   ret=0
-  dig_with_opts +tcp @10.53.0.2 +ttlunits +nottlid A weeks.example > dig.out.test$n || ret=1
-  grep "^weeks.example.		IN" < dig.out.test$n > /dev/null || ret=1
-  dig_with_opts +tcp @10.53.0.2 +nottlid +ttlunits A weeks.example > dig.out.test$n || ret=1
-  grep "^weeks.example.		3w" < dig.out.test$n > /dev/null || ret=1
-  dig_with_opts +tcp @10.53.0.2 +nottlid +nottlunits A weeks.example > dig.out.test$n || ret=1
-  grep "^weeks.example.		1814400" < dig.out.test$n > /dev/null || ret=1
+  dig_with_opts +tcp @10.53.0.2 +ttlunits +nottlid A weeks.example >dig.out.test$n || ret=1
+  grep "^weeks.example.		IN" <dig.out.test$n >/dev/null || ret=1
+  dig_with_opts +tcp @10.53.0.2 +nottlid +ttlunits A weeks.example >dig.out.test$n || ret=1
+  grep "^weeks.example.		3w" <dig.out.test$n >/dev/null || ret=1
+  dig_with_opts +tcp @10.53.0.2 +nottlid +nottlunits A weeks.example >dig.out.test$n || ret=1
+  grep "^weeks.example.		1814400" <dig.out.test$n >/dev/null || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking dig preserves origin on TCP retries ($n)"
   ret=0
   # Ask ans4 to still accept TCP connections, but not respond to queries
   echo "//" | sendcmd 10.53.0.4
-  dig_with_opts -d +tcp @10.53.0.4 +retry=1 +time=1 +domain=bar foo > dig.out.test$n 2>&1 && ret=1
+  dig_with_opts -d +tcp @10.53.0.4 +retry=1 +time=1 +domain=bar foo >dig.out.test$n 2>&1 && ret=1
   test "$(grep -c "trying origin bar" dig.out.test$n)" -eq 2 || ret=1
-  grep "using root origin" < dig.out.test$n > /dev/null && ret=1
+  grep "using root origin" <dig.out.test$n >/dev/null && ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking dig -6 -4 ($n)"
   ret=0
-  dig_with_opts +tcp @10.53.0.2 -4 -6 A a.example > dig.out.test$n 2>&1 && ret=1
-  grep "only one of -4 and -6 allowed" < dig.out.test$n > /dev/null || ret=1
+  dig_with_opts +tcp @10.53.0.2 -4 -6 A a.example >dig.out.test$n 2>&1 && ret=1
+  grep "only one of -4 and -6 allowed" <dig.out.test$n >/dev/null || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking dig @IPv6addr -4 A a.example ($n)"
-  if testsock6 fd92:7065:b8e:ffff::2 2>/dev/null
-  then
+  if testsock6 fd92:7065:b8e:ffff::2 2>/dev/null; then
     ret=0
-    dig_with_opts +tcp @fd92:7065:b8e:ffff::2 -4 A a.example > dig.out.test$n 2>&1 && ret=1
-    grep "address family not supported" < dig.out.test$n > /dev/null || ret=1
+    dig_with_opts +tcp @fd92:7065:b8e:ffff::2 -4 A a.example >dig.out.test$n 2>&1 && ret=1
+    grep "address family not supported" <dig.out.test$n >/dev/null || ret=1
     if [ $ret -ne 0 ]; then echo_i "failed"; fi
-    status=$((status+ret))
+    status=$((status + ret))
   else
     echo_i "IPv6 unavailable; skipping"
   fi
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking dig @IPv4addr -6 +mapped A a.example ($n)"
-  if testsock6 fd92:7065:b8e:ffff::2 2>/dev/null && [ "$(uname -s)" != "OpenBSD" ]
-  then
+  if testsock6 fd92:7065:b8e:ffff::2 2>/dev/null && [ "$(uname -s)" != "OpenBSD" ]; then
     ret=0
-    dig_with_opts +tcp @10.53.0.2 -6 +mapped A a.example > dig.out.test$n 2>&1 || ret=1
-    grep "SERVER: ::ffff:10.53.0.2#$PORT" < dig.out.test$n > /dev/null || ret=1
+    dig_with_opts +tcp @10.53.0.2 -6 +mapped A a.example >dig.out.test$n 2>&1 || ret=1
+    grep "SERVER: ::ffff:10.53.0.2#$PORT" <dig.out.test$n >/dev/null || ret=1
     if [ $ret -ne 0 ]; then echo_i "failed"; fi
-    status=$((status+ret))
+    status=$((status + ret))
   else
     echo_i "IPv6 or IPv4-to-IPv6 mapping unavailable; skipping"
   fi
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking dig +tcp @IPv4addr -6 +nomapped A a.example ($n)"
-  if testsock6 fd92:7065:b8e:ffff::2 2>/dev/null
-  then
+  if testsock6 fd92:7065:b8e:ffff::2 2>/dev/null; then
     ret=0
-    dig_with_opts +tcp @10.53.0.2 -6 +nomapped A a.example > dig.out.test$n 2>&1 || ret=1
-    grep "SERVER: ::ffff:10.53.0.2#$PORT" < dig.out.test$n > /dev/null && ret=1
+    dig_with_opts +tcp @10.53.0.2 -6 +nomapped A a.example >dig.out.test$n 2>&1 || ret=1
+    grep "SERVER: ::ffff:10.53.0.2#$PORT" <dig.out.test$n >/dev/null && ret=1
     if [ $ret -ne 0 ]; then echo_i "failed"; fi
-    status=$((status+ret))
+    status=$((status + ret))
   else
     echo_i "IPv6 unavailable; skipping"
   fi
-  n=$((n+1))
+  n=$((n + 1))
 
   echo_i "checking dig +notcp @IPv4addr -6 +nomapped A a.example ($n)"
-  if testsock6 fd92:7065:b8e:ffff::2 2>/dev/null
-  then
+  if testsock6 fd92:7065:b8e:ffff::2 2>/dev/null; then
     ret=0
-    dig_with_opts +notcp @10.53.0.2 -6 +nomapped A a.example > dig.out.test$n 2>&1 || ret=1
-    grep "SERVER: ::ffff:10.53.0.2#$PORT" < dig.out.test$n > /dev/null && ret=1
+    dig_with_opts +notcp @10.53.0.2 -6 +nomapped A a.example >dig.out.test$n 2>&1 || ret=1
+    grep "SERVER: ::ffff:10.53.0.2#$PORT" <dig.out.test$n >/dev/null && ret=1
     if [ $ret -ne 0 ]; then echo_i "failed"; fi
-    status=$((status+ret))
+    status=$((status + ret))
   else
     echo_i "IPv6 unavailable; skipping"
   fi
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking dig +subnet ($n)"
   ret=0
-  dig_with_opts +tcp @10.53.0.2 +subnet=127.0.0.1 A a.example > dig.out.test$n 2>&1 || ret=1
-  grep "CLIENT-SUBNET: 127.0.0.1/32/0" < dig.out.test$n > /dev/null || ret=1
+  dig_with_opts +tcp @10.53.0.2 +subnet=127.0.0.1 A a.example >dig.out.test$n 2>&1 || ret=1
+  grep "CLIENT-SUBNET: 127.0.0.1/32/0" <dig.out.test$n >/dev/null || ret=1
   check_ttl_range dig.out.test$n "A" 300 || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking dig +subnet +subnet ($n)"
   ret=0
-  dig_with_opts +tcp @10.53.0.2 +subnet=127.0.0.0 +subnet=127.0.0.1 A a.example > dig.out.test$n 2>&1 || ret=1
-  grep "CLIENT-SUBNET: 127.0.0.1/32/0" < dig.out.test$n > /dev/null || ret=1
+  dig_with_opts +tcp @10.53.0.2 +subnet=127.0.0.0 +subnet=127.0.0.1 A a.example >dig.out.test$n 2>&1 || ret=1
+  grep "CLIENT-SUBNET: 127.0.0.1/32/0" <dig.out.test$n >/dev/null || ret=1
   check_ttl_range dig.out.test$n "A" 300 || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking dig +subnet with various prefix lengths ($n)"
   ret=0
   for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24; do
-      dig_with_opts +tcp @10.53.0.2 +subnet=255.255.255.255/$i A a.example > dig.out.$i.test$n 2>&1 || ret=1
-      case $i in
-      1|9|17) octet=128 ;;
-      2|10|18) octet=192 ;;
-      3|11|19) octet=224 ;;
-      4|12|20) octet=240 ;;
-      5|13|21) octet=248 ;;
-      6|14|22) octet=252 ;;
-      7|15|23) octet=254 ;;
-      8|16|24) octet=255 ;;
-      esac
-      case $i in
-      1|2|3|4|5|6|7|8) addr="${octet}.0.0.0";;
-      9|10|11|12|13|14|15|16) addr="255.${octet}.0.0";;
-      17|18|19|20|21|22|23|24) addr="255.255.${octet}.0" ;;
-      esac
-      grep "FORMERR" < dig.out.$i.test$n > /dev/null && ret=1
-      grep "CLIENT-SUBNET: $addr/$i/0" < dig.out.$i.test$n > /dev/null || ret=1
-      check_ttl_range dig.out.$i.test$n "A" 300 || ret=1
+    dig_with_opts +tcp @10.53.0.2 +subnet=255.255.255.255/$i A a.example >dig.out.$i.test$n 2>&1 || ret=1
+    case $i in
+      1 | 9 | 17) octet=128 ;;
+      2 | 10 | 18) octet=192 ;;
+      3 | 11 | 19) octet=224 ;;
+      4 | 12 | 20) octet=240 ;;
+      5 | 13 | 21) octet=248 ;;
+      6 | 14 | 22) octet=252 ;;
+      7 | 15 | 23) octet=254 ;;
+      8 | 16 | 24) octet=255 ;;
+    esac
+    case $i in
+      1 | 2 | 3 | 4 | 5 | 6 | 7 | 8) addr="${octet}.0.0.0" ;;
+      9 | 10 | 11 | 12 | 13 | 14 | 15 | 16) addr="255.${octet}.0.0" ;;
+      17 | 18 | 19 | 20 | 21 | 22 | 23 | 24) addr="255.255.${octet}.0" ;;
+    esac
+    grep "FORMERR" <dig.out.$i.test$n >/dev/null && ret=1
+    grep "CLIENT-SUBNET: $addr/$i/0" <dig.out.$i.test$n >/dev/null || ret=1
+    check_ttl_range dig.out.$i.test$n "A" 300 || ret=1
   done
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking dig +subnet=0/0 ($n)"
   ret=0
-  dig_with_opts +tcp @10.53.0.2 +subnet=0/0 A a.example > dig.out.test$n 2>&1 || ret=1
-  grep "status: NOERROR" < dig.out.test$n > /dev/null || ret=1
-  grep "CLIENT-SUBNET: 0.0.0.0/0/0" < dig.out.test$n > /dev/null || ret=1
-  grep "10.0.0.1" < dig.out.test$n > /dev/null || ret=1
+  dig_with_opts +tcp @10.53.0.2 +subnet=0/0 A a.example >dig.out.test$n 2>&1 || ret=1
+  grep "status: NOERROR" <dig.out.test$n >/dev/null || ret=1
+  grep "CLIENT-SUBNET: 0.0.0.0/0/0" <dig.out.test$n >/dev/null || ret=1
+  grep "10.0.0.1" <dig.out.test$n >/dev/null || ret=1
   check_ttl_range dig.out.test$n "A" 300 || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking dig +subnet=0 ($n)"
   ret=0
-  dig_with_opts +tcp @10.53.0.2 +subnet=0 A a.example > dig.out.test$n 2>&1 || ret=1
-  grep "status: NOERROR" < dig.out.test$n > /dev/null || ret=1
-  grep "CLIENT-SUBNET: 0.0.0.0/0/0" < dig.out.test$n > /dev/null || ret=1
-  grep "10.0.0.1" < dig.out.test$n > /dev/null || ret=1
+  dig_with_opts +tcp @10.53.0.2 +subnet=0 A a.example >dig.out.test$n 2>&1 || ret=1
+  grep "status: NOERROR" <dig.out.test$n >/dev/null || ret=1
+  grep "CLIENT-SUBNET: 0.0.0.0/0/0" <dig.out.test$n >/dev/null || ret=1
+  grep "10.0.0.1" <dig.out.test$n >/dev/null || ret=1
   check_ttl_range dig.out.test$n "A" 300 || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking dig +subnet=::/0 ($n)"
   ret=0
-  dig_with_opts +tcp @10.53.0.2 +subnet=::/0 A a.example > dig.out.test$n 2>&1 || ret=1
-  grep "status: NOERROR" < dig.out.test$n > /dev/null || ret=1
-  grep "CLIENT-SUBNET: ::/0/0" < dig.out.test$n > /dev/null || ret=1
-  grep "10.0.0.1" < dig.out.test$n > /dev/null || ret=1
+  dig_with_opts +tcp @10.53.0.2 +subnet=::/0 A a.example >dig.out.test$n 2>&1 || ret=1
+  grep "status: NOERROR" <dig.out.test$n >/dev/null || ret=1
+  grep "CLIENT-SUBNET: ::/0/0" <dig.out.test$n >/dev/null || ret=1
+  grep "10.0.0.1" <dig.out.test$n >/dev/null || ret=1
   check_ttl_range dig.out.test$n "A" 300 || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking dig +ednsopt=8:00000000 (family=0, source=0, scope=0) ($n)"
   ret=0
-  dig_with_opts +tcp @10.53.0.2 +ednsopt=8:00000000 A a.example > dig.out.test$n 2>&1 || ret=1
-  grep "status: NOERROR" < dig.out.test$n > /dev/null || ret=1
-  grep "CLIENT-SUBNET: 0/0/0" < dig.out.test$n > /dev/null || ret=1
-  grep "10.0.0.1" < dig.out.test$n > /dev/null || ret=1
+  dig_with_opts +tcp @10.53.0.2 +ednsopt=8:00000000 A a.example >dig.out.test$n 2>&1 || ret=1
+  grep "status: NOERROR" <dig.out.test$n >/dev/null || ret=1
+  grep "CLIENT-SUBNET: 0/0/0" <dig.out.test$n >/dev/null || ret=1
+  grep "10.0.0.1" <dig.out.test$n >/dev/null || ret=1
   check_ttl_range dig.out.test$n "A" 300 || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking dig +ednsopt=8:00030000 (family=3, source=0, scope=0) ($n)"
   ret=0
-  dig_with_opts +qr +tcp @10.53.0.2 +ednsopt=8:00030000 A a.example > dig.out.test$n 2>&1 || ret=1
-  grep "status: FORMERR" < dig.out.test$n > /dev/null || ret=1
-  grep "CLIENT-SUBNET: 00 03 00 00" < dig.out.test$n > /dev/null || ret=1
+  dig_with_opts +qr +tcp @10.53.0.2 +ednsopt=8:00030000 A a.example >dig.out.test$n 2>&1 || ret=1
+  grep "status: FORMERR" <dig.out.test$n >/dev/null || ret=1
+  grep "CLIENT-SUBNET: 00 03 00 00" <dig.out.test$n >/dev/null || ret=1
   test "$(grep -c "CLIENT-SUBNET: 00 03 00 00" dig.out.test$n)" -eq 1 || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking dig +subnet with prefix lengths between byte boundaries ($n)"
   ret=0
   for p in 9 10 11 12 13 14 15; do
-    dig_with_opts +tcp @10.53.0.2 +subnet=10.53/$p A a.example > dig.out.test.$p.$n 2>&1 || ret=1
-    grep "FORMERR" < dig.out.test.$p.$n > /dev/null && ret=1
-    grep "CLIENT-SUBNET.*/$p/0" < dig.out.test.$p.$n > /dev/null || ret=1
+    dig_with_opts +tcp @10.53.0.2 +subnet=10.53/$p A a.example >dig.out.test.$p.$n 2>&1 || ret=1
+    grep "FORMERR" <dig.out.test.$p.$n >/dev/null && ret=1
+    grep "CLIENT-SUBNET.*/$p/0" <dig.out.test.$p.$n >/dev/null || ret=1
     check_ttl_range dig.out.test.$p.$n "A" 300 || ret=1
   done
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking dig +sp works as an abbreviated form of split ($n)"
   ret=0
-  dig_with_opts @10.53.0.3 +sp=4 -t sshfp foo.example > dig.out.test$n || ret=1
-  grep " 9ABC DEF6 7890 " < dig.out.test$n > /dev/null || ret=1
+  dig_with_opts @10.53.0.3 +sp=4 -t sshfp foo.example >dig.out.test$n || ret=1
+  grep " 9ABC DEF6 7890 " <dig.out.test$n >/dev/null || ret=1
   check_ttl_range dig.out.test$n "SSHFP" 300 || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking dig -c works ($n)"
   ret=0
-  dig_with_opts @10.53.0.3 -c CHAOS -t txt version.bind > dig.out.test$n || ret=1
-  grep "version.bind.		0	CH	TXT" < dig.out.test$n > /dev/null || ret=1
+  dig_with_opts @10.53.0.3 -c CHAOS -t txt version.bind >dig.out.test$n || ret=1
+  grep "version.bind.		0	CH	TXT" <dig.out.test$n >/dev/null || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking dig +dscp ($n)"
   ret=0
-  dig_with_opts @10.53.0.3 +dscp=32 a a.example > /dev/null 2>&1 || ret=1
-  dig_with_opts @10.53.0.3 +dscp=-1 a a.example > /dev/null 2>&1 && ret=1
-  dig_with_opts @10.53.0.3 +dscp=64 a a.example > /dev/null 2>&1 && ret=1
+  dig_with_opts @10.53.0.3 +dscp=32 a a.example >/dev/null 2>&1 || ret=1
+  dig_with_opts @10.53.0.3 +dscp=-1 a a.example >/dev/null 2>&1 && ret=1
+  dig_with_opts @10.53.0.3 +dscp=64 a a.example >/dev/null 2>&1 && ret=1
   #TODO add a check to make sure dig is actually setting the dscp on the query
   #we might have to add better logging to named for this
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking dig +ednsopt with option number ($n)"
   ret=0
-  dig_with_opts @10.53.0.3 +ednsopt=3 a.example > dig.out.test$n 2>&1 || ret=1
-  grep 'NSID: .* ("ns3")' dig.out.test$n > /dev/null || ret=1
+  dig_with_opts @10.53.0.3 +ednsopt=3 a.example >dig.out.test$n 2>&1 || ret=1
+  grep 'NSID: .* ("ns3")' dig.out.test$n >/dev/null || ret=1
   check_ttl_range dig.out.test$n "A" 300 || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking dig +ednsopt with option name ($n)"
   ret=0
-  dig_with_opts @10.53.0.3 +ednsopt=nsid a.example > dig.out.test$n 2>&1 || ret=1
-  grep 'NSID: .* ("ns3")' dig.out.test$n > /dev/null || ret=1
+  dig_with_opts @10.53.0.3 +ednsopt=nsid a.example >dig.out.test$n 2>&1 || ret=1
+  grep 'NSID: .* ("ns3")' dig.out.test$n >/dev/null || ret=1
   check_ttl_range dig.out.test$n "A" 300 || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking ednsopt LLQ prints as expected ($n)"
   ret=0
-  dig_with_opts @10.53.0.3 +ednsopt=llq:0001000200001234567812345678fefefefe +qr a.example > dig.out.test$n 2>&1 || ret=1
+  dig_with_opts @10.53.0.3 +ednsopt=llq:0001000200001234567812345678fefefefe +qr a.example >dig.out.test$n 2>&1 || ret=1
   pat='LLQ: Version: 1, Opcode: 2, Error: 0, Identifier: 1311768465173141112, Lifetime: 4278124286$'
-  tr -d '\r' < dig.out.test$n | grep "$pat" > /dev/null || ret=1
+  tr -d '\r' <dig.out.test$n | grep "$pat" >/dev/null || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking that dig warns about .local queries ($n)"
   ret=0
-  dig_with_opts @10.53.0.3 local soa > dig.out.test$n 2>&1 || ret=1
-  grep ";; WARNING: .local is reserved for Multicast DNS" dig.out.test$n > /dev/null || ret=1
+  dig_with_opts @10.53.0.3 local soa >dig.out.test$n 2>&1 || ret=1
+  grep ";; WARNING: .local is reserved for Multicast DNS" dig.out.test$n >/dev/null || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "check that dig processes +ednsopt=key-tag and FORMERR is returned ($n)"
   ret=0
-  dig_with_opts @10.53.0.3 +ednsopt=key-tag a.example +qr > dig.out.test$n 2>&1 || ret=1
-  grep "; KEY-TAG: *$" dig.out.test$n > /dev/null || ret=1
-  grep "status: FORMERR" dig.out.test$n > /dev/null || ret=1
+  dig_with_opts @10.53.0.3 +ednsopt=key-tag a.example +qr >dig.out.test$n 2>&1 || ret=1
+  grep "; KEY-TAG: *$" dig.out.test$n >/dev/null || ret=1
+  grep "status: FORMERR" dig.out.test$n >/dev/null || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "check that dig processes +ednsopt=key-tag:<value-list> ($n)"
   ret=0
-  dig_with_opts @10.53.0.3 +ednsopt=key-tag:00010002 a.example +qr > dig.out.test$n 2>&1 || ret=1
-  grep "; KEY-TAG: 1, 2$" dig.out.test$n > /dev/null || ret=1
-  grep "status: FORMERR" dig.out.test$n > /dev/null && ret=1
+  dig_with_opts @10.53.0.3 +ednsopt=key-tag:00010002 a.example +qr >dig.out.test$n 2>&1 || ret=1
+  grep "; KEY-TAG: 1, 2$" dig.out.test$n >/dev/null || ret=1
+  grep "status: FORMERR" dig.out.test$n >/dev/null && ret=1
   check_ttl_range dig.out.test$n "A" 300 || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "check that dig processes +ednsopt=key-tag:<malformed-value-list> and FORMERR is returned ($n)"
   ret=0
-  dig_with_opts @10.53.0.3 +ednsopt=key-tag:0001000201 a.example +qr > dig.out.test$n 2>&1 || ret=1
-  grep "; KEY-TAG: 00 01 00 02 01" dig.out.test$n > /dev/null || ret=1
-  grep "status: FORMERR" dig.out.test$n > /dev/null || ret=1
+  dig_with_opts @10.53.0.3 +ednsopt=key-tag:0001000201 a.example +qr >dig.out.test$n 2>&1 || ret=1
+  grep "; KEY-TAG: 00 01 00 02 01" dig.out.test$n >/dev/null || ret=1
+  grep "status: FORMERR" dig.out.test$n >/dev/null || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "check that dig processes +ednsopt=client-tag:value ($n)"
   ret=0
-  dig_with_opts @10.53.0.3 +ednsopt=client-tag:0001 a.example +qr > dig.out.test$n 2>&1 || ret=1
-  grep "; CLIENT-TAG: 1$" dig.out.test$n > /dev/null || ret=1
-  grep "status: FORMERR" dig.out.test$n > /dev/null && ret=1
+  dig_with_opts @10.53.0.3 +ednsopt=client-tag:0001 a.example +qr >dig.out.test$n 2>&1 || ret=1
+  grep "; CLIENT-TAG: 1$" dig.out.test$n >/dev/null || ret=1
+  grep "status: FORMERR" dig.out.test$n >/dev/null && ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "check that FORMERR is returned for a too short client-tag ($n)"
   ret=0
-  dig_with_opts @10.53.0.3 +ednsopt=client-tag:01 a.example +qr > dig.out.test$n 2>&1 || ret=1
-  grep "; CLIENT-TAG" dig.out.test$n > /dev/null || ret=1
-  grep "status: FORMERR" dig.out.test$n > /dev/null || ret=1
+  dig_with_opts @10.53.0.3 +ednsopt=client-tag:01 a.example +qr >dig.out.test$n 2>&1 || ret=1
+  grep "; CLIENT-TAG" dig.out.test$n >/dev/null || ret=1
+  grep "status: FORMERR" dig.out.test$n >/dev/null || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "check that FORMERR is returned for a too long client-tag ($n)"
   ret=0
-  dig_with_opts @10.53.0.3 +ednsopt=client-tag:000001 a.example +qr > dig.out.test$n 2>&1 || ret=1
-  grep "; CLIENT-TAG" dig.out.test$n > /dev/null || ret=1
-  grep "status: FORMERR" dig.out.test$n > /dev/null || ret=1
+  dig_with_opts @10.53.0.3 +ednsopt=client-tag:000001 a.example +qr >dig.out.test$n 2>&1 || ret=1
+  grep "; CLIENT-TAG" dig.out.test$n >/dev/null || ret=1
+  grep "status: FORMERR" dig.out.test$n >/dev/null || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "check that dig processes +ednsopt=server-tag:value ($n)"
   ret=0
-  dig_with_opts @10.53.0.3 +ednsopt=server-tag:0001 a.example +qr > dig.out.test$n 2>&1 || ret=1
-  grep "; SERVER-TAG: 1$" dig.out.test$n > /dev/null || ret=1
-  grep "status: FORMERR" dig.out.test$n > /dev/null && ret=1
+  dig_with_opts @10.53.0.3 +ednsopt=server-tag:0001 a.example +qr >dig.out.test$n 2>&1 || ret=1
+  grep "; SERVER-TAG: 1$" dig.out.test$n >/dev/null || ret=1
+  grep "status: FORMERR" dig.out.test$n >/dev/null && ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "check that FORMERR is returned for a too short server-tag ($n)"
   ret=0
-  dig_with_opts @10.53.0.3 +ednsopt=server-tag:01 a.example +qr > dig.out.test$n 2>&1 || ret=1
-  grep "; SERVER-TAG" dig.out.test$n > /dev/null || ret=1
-  grep "status: FORMERR" dig.out.test$n > /dev/null || ret=1
+  dig_with_opts @10.53.0.3 +ednsopt=server-tag:01 a.example +qr >dig.out.test$n 2>&1 || ret=1
+  grep "; SERVER-TAG" dig.out.test$n >/dev/null || ret=1
+  grep "status: FORMERR" dig.out.test$n >/dev/null || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "check that FORMERR is returned for a too long server-tag ($n)"
   ret=0
-  dig_with_opts @10.53.0.3 +ednsopt=server-tag:000001 a.example +qr > dig.out.test$n 2>&1 || ret=1
-  grep "; SERVER-TAG" dig.out.test$n > /dev/null || ret=1
-  grep "status: FORMERR" dig.out.test$n > /dev/null || ret=1
+  dig_with_opts @10.53.0.3 +ednsopt=server-tag:000001 a.example +qr >dig.out.test$n 2>&1 || ret=1
+  grep "; SERVER-TAG" dig.out.test$n >/dev/null || ret=1
+  grep "status: FORMERR" dig.out.test$n >/dev/null || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "check that Extended DNS Error 0 is printed correctly ($n)"
   # First defined EDE code, additional text "foo".
-  dig_with_opts @10.53.0.3 +ednsopt=ede:0000666f6f a.example +qr > dig.out.test$n 2>&1 || ret=1
+  dig_with_opts @10.53.0.3 +ednsopt=ede:0000666f6f a.example +qr >dig.out.test$n 2>&1 || ret=1
   pat='^; EDE: 0 (Other): (foo)$'
-  tr -d '\r' < dig.out.test$n | grep "$pat" > /dev/null || ret=1
+  tr -d '\r' <dig.out.test$n | grep "$pat" >/dev/null || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "check that Extended DNS Error 24 is printed correctly ($n)"
   # Last defined EDE code, no additional text.
-  dig_with_opts @10.53.0.3 +ednsopt=ede:0018 a.example +qr > dig.out.test$n 2>&1 || ret=1
+  dig_with_opts @10.53.0.3 +ednsopt=ede:0018 a.example +qr >dig.out.test$n 2>&1 || ret=1
   pat='^; EDE: 24 (Invalid Data)$'
-  tr -d '\r' < dig.out.test$n | grep "$pat" > /dev/null || ret=1
+  tr -d '\r' <dig.out.test$n | grep "$pat" >/dev/null || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "check that Extended DNS Error 25 is printed correctly ($n)"
   # First undefined EDE code, additional text "foo".
-  dig_with_opts @10.53.0.3 +ednsopt=ede:0019666f6f a.example +qr > dig.out.test$n 2>&1 || ret=1
+  dig_with_opts @10.53.0.3 +ednsopt=ede:0019666f6f a.example +qr >dig.out.test$n 2>&1 || ret=1
   pat='^; EDE: 25: (foo)$'
-  tr -d '\r' < dig.out.test$n | grep "$pat" > /dev/null || ret=1
+  tr -d '\r' <dig.out.test$n | grep "$pat" >/dev/null || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "check that invalid Extended DNS Error (length 0) is printed ($n)"
   # EDE payload is too short
-  dig_with_opts @10.53.0.3 +ednsopt=ede a.example +qr > dig.out.test$n 2>&1 || ret=1
+  dig_with_opts @10.53.0.3 +ednsopt=ede a.example +qr >dig.out.test$n 2>&1 || ret=1
   pat='^; EDE:$'
-  tr -d '\r' < dig.out.test$n | grep "$pat" > /dev/null || ret=1
+  tr -d '\r' <dig.out.test$n | grep "$pat" >/dev/null || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "check that invalid Extended DNS Error (length 1) is printed ($n)"
   # EDE payload is too short
-  dig_with_opts @10.53.0.3 +ednsopt=ede:00 a.example +qr > dig.out.test$n 2>&1 || ret=1
+  dig_with_opts @10.53.0.3 +ednsopt=ede:00 a.example +qr >dig.out.test$n 2>&1 || ret=1
   pat='^; EDE: 00 (".")$'
-  tr -d '\r' < dig.out.test$n | grep "$pat" > /dev/null || ret=1
+  tr -d '\r' <dig.out.test$n | grep "$pat" >/dev/null || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  if [ $HAS_PYYAML -ne 0 ] ; then
-    n=$((n+1))
+  if [ $HAS_PYYAML -ne 0 ]; then
+    n=$((n + 1))
     echo_i "check that +yaml Extended DNS Error 0 is printed correctly ($n)"
     # First defined EDE code, additional text "foo".
-    dig_with_opts @10.53.0.3 +yaml +ednsopt=ede:0000666f6f a.example +qr > dig.out.test$n 2>&1 || ret=1
-    $PYTHON yamlget.py dig.out.test$n 0 message query_message_data OPT_PSEUDOSECTION EDNS EDE INFO-CODE > yamlget.out.test$n 2>&1 || ret=1
-    read -r value < yamlget.out.test$n
+    dig_with_opts @10.53.0.3 +yaml +ednsopt=ede:0000666f6f a.example +qr >dig.out.test$n 2>&1 || ret=1
+    $PYTHON yamlget.py dig.out.test$n 0 message query_message_data OPT_PSEUDOSECTION EDNS EDE INFO-CODE >yamlget.out.test$n 2>&1 || ret=1
+    read -r value <yamlget.out.test$n
     [ "$value" = "0 (Other)" ] || ret=1
-    $PYTHON yamlget.py dig.out.test$n 0 message query_message_data OPT_PSEUDOSECTION EDNS EDE EXTRA-TEXT > yamlget.out.test$n 2>&1 || ret=1
-    read -r value < yamlget.out.test$n
+    $PYTHON yamlget.py dig.out.test$n 0 message query_message_data OPT_PSEUDOSECTION EDNS EDE EXTRA-TEXT >yamlget.out.test$n 2>&1 || ret=1
+    read -r value <yamlget.out.test$n
     [ "$value" = "foo" ] || ret=1
     if [ $ret -ne 0 ]; then echo_i "failed"; fi
-    status=$((status+ret))
+    status=$((status + ret))
 
-    n=$((n+1))
+    n=$((n + 1))
     echo_i "check that +yaml Extended DNS Error 24 is printed correctly ($n)"
     # Last defined EDE code, no additional text.
-    dig_with_opts @10.53.0.3 +yaml +ednsopt=ede:0018 a.example +qr > dig.out.test$n 2>&1 || ret=1
-    $PYTHON yamlget.py dig.out.test$n 0 message query_message_data OPT_PSEUDOSECTION EDNS EDE INFO-CODE > yamlget.out.test$n 2>&1 || ret=1
-    read -r value < yamlget.out.test$n
+    dig_with_opts @10.53.0.3 +yaml +ednsopt=ede:0018 a.example +qr >dig.out.test$n 2>&1 || ret=1
+    $PYTHON yamlget.py dig.out.test$n 0 message query_message_data OPT_PSEUDOSECTION EDNS EDE INFO-CODE >yamlget.out.test$n 2>&1 || ret=1
+    read -r value <yamlget.out.test$n
     [ "$value" = "24 (Invalid Data)" ] || ret=1
-    $PYTHON yamlget.py dig.out.test$n 0 message query_message_data OPT_PSEUDOSECTION EDNS EDE EXTRA-TEXT > yamlget.out.test$n 2>&1 && ret=1
+    $PYTHON yamlget.py dig.out.test$n 0 message query_message_data OPT_PSEUDOSECTION EDNS EDE EXTRA-TEXT >yamlget.out.test$n 2>&1 && ret=1
     if [ $ret -ne 0 ]; then echo_i "failed"; fi
-    status=$((status+ret))
+    status=$((status + ret))
 
-    n=$((n+1))
+    n=$((n + 1))
     echo_i "check that +yaml Extended DNS Error 25 is printed correctly ($n)"
     # First undefined EDE code, additional text "foo".
-    dig_with_opts @10.53.0.3 +yaml +ednsopt=ede:0019666f6f a.example +qr > dig.out.test$n 2>&1 || ret=1
-    $PYTHON yamlget.py dig.out.test$n 0 message query_message_data OPT_PSEUDOSECTION EDNS EDE INFO-CODE > yamlget.out.test$n 2>&1 || ret=1
-    read -r value < yamlget.out.test$n
+    dig_with_opts @10.53.0.3 +yaml +ednsopt=ede:0019666f6f a.example +qr >dig.out.test$n 2>&1 || ret=1
+    $PYTHON yamlget.py dig.out.test$n 0 message query_message_data OPT_PSEUDOSECTION EDNS EDE INFO-CODE >yamlget.out.test$n 2>&1 || ret=1
+    read -r value <yamlget.out.test$n
     [ "$value" = "25" ] || ret=1
-    $PYTHON yamlget.py dig.out.test$n 0 message query_message_data OPT_PSEUDOSECTION EDNS EDE EXTRA-TEXT > yamlget.out.test$n 2>&1 || ret=1
-    read -r value < yamlget.out.test$n
+    $PYTHON yamlget.py dig.out.test$n 0 message query_message_data OPT_PSEUDOSECTION EDNS EDE EXTRA-TEXT >yamlget.out.test$n 2>&1 || ret=1
+    read -r value <yamlget.out.test$n
     [ "$value" = "foo" ] || ret=1
     if [ $ret -ne 0 ]; then echo_i "failed"; fi
-    status=$((status+ret))
+    status=$((status + ret))
 
-    n=$((n+1))
+    n=$((n + 1))
     echo_i "check that invalid Extended DNS Error (length 0) is printed ($n)"
     # EDE payload is too short
-    dig_with_opts @10.53.0.3 +yaml +ednsopt=ede a.example +qr > dig.out.test$n 2>&1 || ret=1
-    $PYTHON yamlget.py dig.out.test$n 0 message query_message_data OPT_PSEUDOSECTION EDNS EDE > yamlget.out.test$n 2>&1 || ret=1
-    read -r value < yamlget.out.test$n
+    dig_with_opts @10.53.0.3 +yaml +ednsopt=ede a.example +qr >dig.out.test$n 2>&1 || ret=1
+    $PYTHON yamlget.py dig.out.test$n 0 message query_message_data OPT_PSEUDOSECTION EDNS EDE >yamlget.out.test$n 2>&1 || ret=1
+    read -r value <yamlget.out.test$n
     [ "$value" = "None" ] || ret=1
     if [ $ret -ne 0 ]; then echo_i "failed"; fi
-    status=$((status+ret))
+    status=$((status + ret))
 
-    n=$((n+1))
+    n=$((n + 1))
     echo_i "check that invalid +yaml Extended DNS Error (length 1) is printed ($n)"
     # EDE payload is too short
-    dig_with_opts @10.53.0.3 +yaml +ednsopt=ede:00 a.example +qr > dig.out.test$n 2>&1 || ret=1
-    $PYTHON yamlget.py dig.out.test$n 0 message query_message_data OPT_PSEUDOSECTION EDNS EDE > yamlget.out.test$n 2>&1 || ret=1
-    read -r value < yamlget.out.test$n
+    dig_with_opts @10.53.0.3 +yaml +ednsopt=ede:00 a.example +qr >dig.out.test$n 2>&1 || ret=1
+    $PYTHON yamlget.py dig.out.test$n 0 message query_message_data OPT_PSEUDOSECTION EDNS EDE >yamlget.out.test$n 2>&1 || ret=1
+    read -r value <yamlget.out.test$n
     [ "$value" = '00 (".")' ] || ret=1
     if [ $ret -ne 0 ]; then echo_i "failed"; fi
-    status=$((status+ret))
+    status=$((status + ret))
   fi
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "check that dig handles malformed option '+ednsopt=:' gracefully ($n)"
   ret=0
-  dig_with_opts @10.53.0.3 +ednsopt=: a.example > dig.out.test$n 2>&1 && ret=1
-  grep "ednsopt no code point specified" dig.out.test$n > /dev/null || ret=1
+  dig_with_opts @10.53.0.3 +ednsopt=: a.example >dig.out.test$n 2>&1 && ret=1
+  grep "ednsopt no code point specified" dig.out.test$n >/dev/null || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "check that dig gracefully handles bad escape in domain name ($n)"
   ret=0
   digstatus=0
-  dig_with_opts @10.53.0.3 '\0.' > dig.out.test$n 2>&1 || digstatus=$?
-  echo digstatus=$digstatus >> dig.out.test$n
+  dig_with_opts @10.53.0.3 '\0.' >dig.out.test$n 2>&1 || digstatus=$?
+  echo digstatus=$digstatus >>dig.out.test$n
   test $digstatus -eq 10 || ret=1
-  grep REQUIRE dig.out.test$n > /dev/null && ret=1
-  grep "is not a legal name (bad escape)" dig.out.test$n > /dev/null || ret=1
+  grep REQUIRE dig.out.test$n >/dev/null && ret=1
+  grep "is not a legal name (bad escape)" dig.out.test$n >/dev/null || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "check that dig -q -m works ($n)"
   ret=0
-  dig_with_opts @10.53.0.3 -q -m > dig.out.test$n 2>&1
+  dig_with_opts @10.53.0.3 -q -m >dig.out.test$n 2>&1
   pat='^;-m\..*IN.*A$'
-  tr -d '\r' < dig.out.test$n | grep "$pat" > /dev/null || ret=1
-  grep "Dump of all outstanding memory allocations" dig.out.test$n > /dev/null && ret=1
+  tr -d '\r' <dig.out.test$n | grep "$pat" >/dev/null || ret=1
+  grep "Dump of all outstanding memory allocations" dig.out.test$n >/dev/null && ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking exit code for a retry upon TCP EOF (immediate -> immediate) ($n)"
   ret=0
   echo "no_response no_response" | sendcmd 10.53.0.5
-  dig_with_opts @10.53.0.5 example AXFR +tries=2 > dig.out.test$n 2>&1 && ret=1
+  dig_with_opts @10.53.0.5 example AXFR +tries=2 >dig.out.test$n 2>&1 && ret=1
   # Sanity check: ensure ans5 behaves as expected.
-  [ `grep "communications error.*end of file" dig.out.test$n | wc -l` -eq 2 ] || ret=1
+  [ $(grep "communications error.*end of file" dig.out.test$n | wc -l) -eq 2 ] || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking exit code for a retry upon TCP EOF (partial AXFR -> partial AXFR) ($n)"
   ret=0
   echo "partial_axfr partial_axfr" | sendcmd 10.53.0.5
-  dig_with_opts @10.53.0.5 example AXFR +tries=2 > dig.out.test$n 2>&1 && ret=1
+  dig_with_opts @10.53.0.5 example AXFR +tries=2 >dig.out.test$n 2>&1 && ret=1
   # Sanity check: ensure ans5 behaves as expected.
-  [ `grep "communications error.*end of file" dig.out.test$n | wc -l` -eq 2 ] || ret=1
+  [ $(grep "communications error.*end of file" dig.out.test$n | wc -l) -eq 2 ] || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking exit code for a retry upon TCP EOF (immediate -> partial AXFR) ($n)"
   ret=0
   echo "no_response partial_axfr" | sendcmd 10.53.0.5
-  dig_with_opts @10.53.0.5 example AXFR +tries=2 > dig.out.test$n 2>&1 && ret=1
+  dig_with_opts @10.53.0.5 example AXFR +tries=2 >dig.out.test$n 2>&1 && ret=1
   # Sanity check: ensure ans5 behaves as expected.
-  [ `grep "communications error.*end of file" dig.out.test$n | wc -l` -eq 2 ] || ret=1
+  [ $(grep "communications error.*end of file" dig.out.test$n | wc -l) -eq 2 ] || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking exit code for a retry upon TCP EOF (partial AXFR -> immediate) ($n)"
   ret=0
   echo "partial_axfr no_response" | sendcmd 10.53.0.5
-  dig_with_opts @10.53.0.5 example AXFR +tries=2 > dig.out.test$n 2>&1 && ret=1
+  dig_with_opts @10.53.0.5 example AXFR +tries=2 >dig.out.test$n 2>&1 && ret=1
   # Sanity check: ensure ans5 behaves as expected.
-  [ `grep "communications error.*end of file" dig.out.test$n | wc -l` -eq 2 ] || ret=1
+  [ $(grep "communications error.*end of file" dig.out.test$n | wc -l) -eq 2 ] || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking exit code for a retry upon TCP EOF (immediate -> complete AXFR) ($n)"
   ret=0
   echo "no_response complete_axfr" | sendcmd 10.53.0.5
-  dig_with_opts @10.53.0.5 example AXFR +tries=2 > dig.out.test$n 2>&1 || ret=1
+  dig_with_opts @10.53.0.5 example AXFR +tries=2 >dig.out.test$n 2>&1 || ret=1
   # Sanity check: ensure ans5 behaves as expected.
-  [ `grep "communications error.*end of file" dig.out.test$n | wc -l` -eq 1 ] || ret=1
+  [ $(grep "communications error.*end of file" dig.out.test$n | wc -l) -eq 1 ] || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking exit code for a retry upon TCP EOF (partial AXFR -> complete AXFR) ($n)"
   ret=0
   echo "partial_axfr complete_axfr" | sendcmd 10.53.0.5
-  dig_with_opts @10.53.0.5 example AXFR +tries=2 > dig.out.test$n 2>&1 || ret=1
+  dig_with_opts @10.53.0.5 example AXFR +tries=2 >dig.out.test$n 2>&1 || ret=1
   # Sanity check: ensure ans5 behaves as expected.
-  [ `grep "communications error.*end of file" dig.out.test$n | wc -l` -eq 1 ] || ret=1
+  [ $(grep "communications error.*end of file" dig.out.test$n | wc -l) -eq 1 ] || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking +tries=1 won't retry twice upon TCP EOF ($n)"
   ret=0
   echo "no_response no_response" | sendcmd 10.53.0.5
-  dig_with_opts @10.53.0.5 example AXFR +tries=1 > dig.out.test$n 2>&1 && ret=1
+  dig_with_opts @10.53.0.5 example AXFR +tries=1 >dig.out.test$n 2>&1 && ret=1
   # Sanity check: ensure ans5 behaves as expected.
-  [ `grep "communications error.*end of file" dig.out.test$n | wc -l` -eq 1 ] || ret=1
+  [ $(grep "communications error.*end of file" dig.out.test$n | wc -l) -eq 1 ] || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking +retry=0 won't retry twice upon TCP EOF ($n)"
   ret=0
-  dig_with_opts @10.53.0.5 example AXFR +retry=0 > dig.out.test$n 2>&1 && ret=1
+  dig_with_opts @10.53.0.5 example AXFR +retry=0 >dig.out.test$n 2>&1 && ret=1
   # Sanity check: ensure ans5 behaves as expected.
-  [ `grep "communications error.*end of file" dig.out.test$n | wc -l` -eq 1 ] || ret=1
+  [ $(grep "communications error.*end of file" dig.out.test$n | wc -l) -eq 1 ] || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "check that dig +expandaaaa works ($n)"
   ret=0
-  dig_with_opts @10.53.0.3 +expandaaaa AAAA ns2.example > dig.out.test$n 2>&1 || ret=1
-  grep "ns2.example.*fd92:7065:0b8e:ffff:0000:0000:0000:0002" dig.out.test$n > /dev/null || ret=1
+  dig_with_opts @10.53.0.3 +expandaaaa AAAA ns2.example >dig.out.test$n 2>&1 || ret=1
+  grep "ns2.example.*fd92:7065:0b8e:ffff:0000:0000:0000:0002" dig.out.test$n >/dev/null || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "check that dig +noexpandaaaa works ($n)"
   ret=0
-  dig_with_opts @10.53.0.3 +noexpandaaaa AAAA ns2.example > dig.out.test$n 2>&1 || ret=1
-  grep "ns2.example.*fd92:7065:b8e:ffff::2" dig.out.test$n > /dev/null || ret=1
+  dig_with_opts @10.53.0.3 +noexpandaaaa AAAA ns2.example >dig.out.test$n 2>&1 || ret=1
+  grep "ns2.example.*fd92:7065:b8e:ffff::2" dig.out.test$n >/dev/null || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "check that dig default for +[no]expandaaa (+noexpandaaaa) works ($n)"
   ret=0
-  dig_with_opts @10.53.0.3 AAAA ns2.example > dig.out.test$n 2>&1 || ret=1
-  grep "ns2.example.*fd92:7065:b8e:ffff::2" dig.out.test$n > /dev/null || ret=1
+  dig_with_opts @10.53.0.3 AAAA ns2.example >dig.out.test$n 2>&1 || ret=1
+  grep "ns2.example.*fd92:7065:b8e:ffff::2" dig.out.test$n >/dev/null || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
 
   echo_i "check that dig +short +expandaaaa works ($n)"
   ret=0
-  dig_with_opts @10.53.0.3 +short +expandaaaa AAAA ns2.example > dig.out.test$n 2>&1 || ret=1
+  dig_with_opts @10.53.0.3 +short +expandaaaa AAAA ns2.example >dig.out.test$n 2>&1 || ret=1
   pat='^fd92:7065:0b8e:ffff:0000:0000:0000:0002$'
-  tr -d '\r' < dig.out.test$n | grep "$pat" > /dev/null || ret=1
+  tr -d '\r' <dig.out.test$n | grep "$pat" >/dev/null || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  if [ $HAS_PYYAML -ne 0 ] ; then
-    n=$((n+1))
+  if [ $HAS_PYYAML -ne 0 ]; then
+    n=$((n + 1))
     echo_i "check dig +yaml output ($n)"
     ret=0
-    dig_with_opts +qr +yaml @10.53.0.3 any ns2.example > dig.out.test$n 2>&1 || ret=1
+    dig_with_opts +qr +yaml @10.53.0.3 any ns2.example >dig.out.test$n 2>&1 || ret=1
     value=$($PYTHON yamlget.py dig.out.test$n 0 message query_message_data status || ret=1)
     [ "$value" = "NOERROR" ] || ret=1
     value=$($PYTHON yamlget.py dig.out.test$n 1 message response_message_data status || ret=1)
@@ -943,401 +938,399 @@ if [ -x "$DIG" ] ; then
     value=$($PYTHON yamlget.py dig.out.test$n 1 message response_message_data QUESTION_SECTION 0 || ret=1)
     [ "$value" = "ns2.example. IN ANY" ] || ret=1
     if [ $ret -ne 0 ]; then echo_i "failed"; fi
-    status=$((status+ret))
+    status=$((status + ret))
 
-    n=$((n+1))
+    n=$((n + 1))
     echo_i "check dig +yaml output of an IPv6 address ending in zeroes ($n)"
     ret=0
-    dig_with_opts +qr +yaml @10.53.0.3 aaaa d.example > dig.out.test$n 2>&1 || ret=1
-    $PYTHON yamlget.py dig.out.test$n 1 message response_message_data ANSWER_SECTION 0 > yamlget.out.test$n 2>&1 || ret=1
-    read -r value < yamlget.out.test$n
+    dig_with_opts +qr +yaml @10.53.0.3 aaaa d.example >dig.out.test$n 2>&1 || ret=1
+    $PYTHON yamlget.py dig.out.test$n 1 message response_message_data ANSWER_SECTION 0 >yamlget.out.test$n 2>&1 || ret=1
+    read -r value <yamlget.out.test$n
     [ "$value" = "d.example. 300 IN AAAA fd92:7065:b8e:ffff::0" ] || ret=1
     if [ $ret -ne 0 ]; then echo_i "failed"; fi
-    status=$((status+ret))
+    status=$((status + ret))
   fi
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "check that dig +unexpected works ($n)"
   ret=0
-  dig_with_opts @10.53.0.6 +unexpected a a.example > dig.out.test$n || ret=1
-  grep 'reply from unexpected source' dig.out.test$n > /dev/null || ret=1
-  grep 'status: NOERROR' dig.out.test$n > /dev/null || ret=1
+  dig_with_opts @10.53.0.6 +unexpected a a.example >dig.out.test$n || ret=1
+  grep 'reply from unexpected source' dig.out.test$n >/dev/null || ret=1
+  grep 'status: NOERROR' dig.out.test$n >/dev/null || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "check that dig +nounexpected works ($n)"
   ret=0
-  dig_with_opts @10.53.0.6 +nounexpected +tries=1 +time=2 a a.example > dig.out.test$n && ret=1
-  grep 'reply from unexpected source' dig.out.test$n > /dev/null || ret=1
-  grep "status: NOERROR" < dig.out.test$n > /dev/null && ret=1
+  dig_with_opts @10.53.0.6 +nounexpected +tries=1 +time=2 a a.example >dig.out.test$n && ret=1
+  grep 'reply from unexpected source' dig.out.test$n >/dev/null || ret=1
+  grep "status: NOERROR" <dig.out.test$n >/dev/null && ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "check that dig default for +[no]unexpected (+nounexpected) works ($n)"
   ret=0
-  dig_with_opts @10.53.0.6 +tries=1 +time=2 a a.example > dig.out.test$n && ret=1
-  grep 'reply from unexpected source' dig.out.test$n > /dev/null || ret=1
-  grep "status: NOERROR" < dig.out.test$n > /dev/null && ret=1
+  dig_with_opts @10.53.0.6 +tries=1 +time=2 a a.example >dig.out.test$n && ret=1
+  grep 'reply from unexpected source' dig.out.test$n >/dev/null || ret=1
+  grep "status: NOERROR" <dig.out.test$n >/dev/null && ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "check that dig +bufsize=0 disables EDNS ($n)"
   ret=0
-  dig_with_opts @10.53.0.3 a.example +bufsize=0 +qr > dig.out.test$n 2>&1 || ret=1
-  grep "EDNS:" dig.out.test$n > /dev/null && ret=1
+  dig_with_opts @10.53.0.3 a.example +bufsize=0 +qr >dig.out.test$n 2>&1 || ret=1
+  grep "EDNS:" dig.out.test$n >/dev/null && ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "check that dig +bufsize=0 +edns sends EDNS with bufsize of 0 ($n)"
   ret=0
-  dig_with_opts @10.53.0.3 a.example +bufsize=0 +edns +qr > dig.out.test$n 2>&1 || ret=1
+  dig_with_opts @10.53.0.3 a.example +bufsize=0 +edns +qr >dig.out.test$n 2>&1 || ret=1
   pat='EDNS:.* udp: 0$'
-  tr -d '\r' < dig.out.test$n | grep -E "$pat" > /dev/null || ret=1
+  tr -d '\r' <dig.out.test$n | grep -E "$pat" >/dev/null || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "check that dig +bufsize restores default bufsize ($n)"
   ret=0
-  dig_with_opts @10.53.0.3 a.example +bufsize=0 +bufsize +qr > dig.out.test$n 2>&1 || ret=1
-  lines1232=`grep "EDNS:.* udp: 1232" dig.out.test$n | wc -l`
-  lines4096=`grep "EDNS:.* udp: 4096" dig.out.test$n | wc -l`
+  dig_with_opts @10.53.0.3 a.example +bufsize=0 +bufsize +qr >dig.out.test$n 2>&1 || ret=1
+  lines1232=$(grep "EDNS:.* udp: 1232" dig.out.test$n | wc -l)
+  lines4096=$(grep "EDNS:.* udp: 4096" dig.out.test$n | wc -l)
   test $lines1232 -eq 1 || ret=1
   test $lines4096 -eq 1 || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "check that dig without -u displays 'Query time' in millseconds ($n)"
   ret=0
-  dig_with_opts @10.53.0.3 a.example > dig.out.test$n 2>&1 || ret=1
+  dig_with_opts @10.53.0.3 a.example >dig.out.test$n 2>&1 || ret=1
   grep ';; Query time: [0-9][0-9]* msec' dig.out.test$n >/dev/null || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "check that dig -u displays 'Query time' in microseconds ($n)"
   ret=0
-  dig_with_opts -u @10.53.0.3 a.example > dig.out.test$n 2>&1 || ret=1
+  dig_with_opts -u @10.53.0.3 a.example >dig.out.test$n 2>&1 || ret=1
   grep ';; Query time: [0-9][0-9]* usec' dig.out.test$n >/dev/null || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "check that dig +yaml without -u displays timestamps in milliseconds ($n)"
   ret=0
-  dig_with_opts +yaml @10.53.0.3 a.example > dig.out.test$n 2>&1 || ret=1
+  dig_with_opts +yaml @10.53.0.3 a.example >dig.out.test$n 2>&1 || ret=1
   grep 'query_time: !!timestamp ....-..-..T..:..:..\....Z' dig.out.test$n >/dev/null || ret=1
   grep 'response_time: !!timestamp ....-..-..T..:..:..\....Z' dig.out.test$n >/dev/null || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "check that dig -u +yaml displays timestamps in microseconds ($n)"
   ret=0
-  dig_with_opts -u +yaml @10.53.0.3 a.example > dig.out.test$n 2>&1 || ret=1
+  dig_with_opts -u +yaml @10.53.0.3 a.example >dig.out.test$n 2>&1 || ret=1
   grep 'query_time: !!timestamp ....-..-..T..:..:..\.......Z' dig.out.test$n >/dev/null || ret=1
   grep 'response_time: !!timestamp ....-..-..T..:..:..\.......Z' dig.out.test$n >/dev/null || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
 else
   echo_i "$DIG is needed, so skipping these dig tests"
 fi
 
-if [ -x "$MDIG" ] ; then
-  n=$((n+1))
+if [ -x "$MDIG" ]; then
+  n=$((n + 1))
   echo_i "check that mdig handles malformed option '+ednsopt=:' gracefully ($n)"
   ret=0
-  mdig_with_opts @10.53.0.3 +ednsopt=: a.example > dig.out.test$n 2>&1 && ret=1
-  grep "ednsopt no code point specified" dig.out.test$n > /dev/null || ret=1
+  mdig_with_opts @10.53.0.3 +ednsopt=: a.example >dig.out.test$n 2>&1 && ret=1
+  grep "ednsopt no code point specified" dig.out.test$n >/dev/null || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking mdig +multi +norrcomments works for DNSKEY (when default is rrcomments)($n)"
   ret=0
-  mdig_with_opts +tcp @10.53.0.3 +multi +norrcomments -t DNSKEY example > dig.out.test$n || ret=1
+  mdig_with_opts +tcp @10.53.0.3 +multi +norrcomments -t DNSKEY example >dig.out.test$n || ret=1
   grep "; ZSK; alg = $DEFAULT_ALGORITHM ; key id = $KEYID" dig.out.test$n && ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking mdig +multi +norrcomments works for SOA (when default is rrcomments)($n)"
   ret=0
-  mdig_with_opts +tcp @10.53.0.3 +multi +norrcomments -t SOA example > dig.out.test$n || ret=1
-  grep "; serial" < dig.out.test$n > /dev/null && ret=1
+  mdig_with_opts +tcp @10.53.0.3 +multi +norrcomments -t SOA example >dig.out.test$n || ret=1
+  grep "; serial" <dig.out.test$n >/dev/null && ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  if [ $HAS_PYYAML -ne 0 ] ; then
-    n=$((n+1))
+  if [ $HAS_PYYAML -ne 0 ]; then
+    n=$((n + 1))
     echo_i "check mdig +yaml output ($n)"
     ret=0
-    mdig_with_opts +yaml @10.53.0.3 -t any ns2.example > dig.out.test$n || ret=1
+    mdig_with_opts +yaml @10.53.0.3 -t any ns2.example >dig.out.test$n || ret=1
     value=$($PYTHON yamlget.py dig.out.test$n 0 message response_message_data status || ret=1)
     [ "$value" = "NOERROR" ] || ret=1
     value=$($PYTHON yamlget.py dig.out.test$n 0 message response_message_data QUESTION_SECTION 0 || ret=1)
     [ "$value" = "ns2.example. IN ANY" ] || ret=1
     if [ $ret -ne 0 ]; then echo_i "failed"; fi
-    status=$((status+ret))
+    status=$((status + ret))
   fi
 else
   echo_i "$MDIG is needed, so skipping these mdig tests"
 fi
 
-if [ -x "$DELV" ] ; then
-  n=$((n+1))
+if [ -x "$DELV" ]; then
+  n=$((n + 1))
   echo_i "checking delv short form works ($n)"
   ret=0
-  delv_with_opts @10.53.0.3 +short a a.example > delv.out.test$n || ret=1
-  test "$(wc -l < delv.out.test$n)" -eq 1 || ret=1
+  delv_with_opts @10.53.0.3 +short a a.example >delv.out.test$n || ret=1
+  test "$(wc -l <delv.out.test$n)" -eq 1 || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking delv split width works ($n)"
   ret=0
-  delv_with_opts @10.53.0.3 +split=4 -t sshfp foo.example > delv.out.test$n || ret=1
-  grep " 9ABC DEF6 7890 " < delv.out.test$n > /dev/null || ret=1
+  delv_with_opts @10.53.0.3 +split=4 -t sshfp foo.example >delv.out.test$n || ret=1
+  grep " 9ABC DEF6 7890 " <delv.out.test$n >/dev/null || ret=1
   check_ttl_range delv.out.test$n "SSHFP" 300 || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking delv +unknownformat works ($n)"
   ret=0
-  delv_with_opts @10.53.0.3 +unknownformat a a.example > delv.out.test$n || ret=1
-  grep "CLASS1[ 	][ 	]*TYPE1[ 	][ 	]*\\\\# 4 0A000001" < delv.out.test$n > /dev/null || ret=1
+  delv_with_opts @10.53.0.3 +unknownformat a a.example >delv.out.test$n || ret=1
+  grep "CLASS1[ 	][ 	]*TYPE1[ 	][ 	]*\\\\# 4 0A000001" <delv.out.test$n >/dev/null || ret=1
   check_ttl_range delv.out.test$n "TYPE1" 300 || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking delv -4 -6 ($n)"
   ret=0
-  delv_with_opts @10.53.0.3 -4 -6 A a.example > delv.out.test$n 2>&1 && ret=1
-  grep "only one of -4 and -6 allowed" < delv.out.test$n > /dev/null || ret=1
+  delv_with_opts @10.53.0.3 -4 -6 A a.example >delv.out.test$n 2>&1 && ret=1
+  grep "only one of -4 and -6 allowed" <delv.out.test$n >/dev/null || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking delv with IPv6 on IPv4 does not work ($n)"
-  if testsock6 fd92:7065:b8e:ffff::3 2>/dev/null
-  then
+  if testsock6 fd92:7065:b8e:ffff::3 2>/dev/null; then
     ret=0
     # following should fail because @IPv4 overrides earlier @IPv6 above
     # and -6 forces IPv6 so this should fail, with a message
     # "Use of IPv4 disabled by -6"
-    delv_with_opts @fd92:7065:b8e:ffff::3 @10.53.0.3 -6 -t txt foo.example > delv.out.test$n 2>&1 && ret=1
+    delv_with_opts @fd92:7065:b8e:ffff::3 @10.53.0.3 -6 -t txt foo.example >delv.out.test$n 2>&1 && ret=1
     # it should have no results but error output
-    grep "testing" < delv.out.test$n > /dev/null && ret=1
-    grep "Use of IPv4 disabled by -6" delv.out.test$n > /dev/null || ret=1
+    grep "testing" <delv.out.test$n >/dev/null && ret=1
+    grep "Use of IPv4 disabled by -6" delv.out.test$n >/dev/null || ret=1
     if [ $ret -ne 0 ]; then echo_i "failed"; fi
-    status=$((status+ret))
+    status=$((status + ret))
   else
     echo_i "IPv6 unavailable; skipping"
   fi
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking delv with IPv4 on IPv6 does not work ($n)"
-  if testsock6 fd92:7065:b8e:ffff::3 2>/dev/null
-  then
+  if testsock6 fd92:7065:b8e:ffff::3 2>/dev/null; then
     ret=0
     # following should fail because @IPv6 overrides earlier @IPv4 above
     # and -4 forces IPv4 so this should fail, with a message
     # "Use of IPv6 disabled by -4"
-    delv_with_opts @10.53.0.3 @fd92:7065:b8e:ffff::3 -4 -t txt foo.example > delv.out.test$n 2>&1 && ret=1
+    delv_with_opts @10.53.0.3 @fd92:7065:b8e:ffff::3 -4 -t txt foo.example >delv.out.test$n 2>&1 && ret=1
     # it should have no results but error output
-    grep "testing" delv.out.test$n > /dev/null && ret=1
-    grep "Use of IPv6 disabled by -4" delv.out.test$n > /dev/null || ret=1
+    grep "testing" delv.out.test$n >/dev/null && ret=1
+    grep "Use of IPv6 disabled by -4" delv.out.test$n >/dev/null || ret=1
     if [ $ret -ne 0 ]; then echo_i "failed"; fi
-    status=$((status+ret))
+    status=$((status + ret))
   else
     echo_i "IPv6 unavailable; skipping"
   fi
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking delv with reverse lookup works ($n)"
   ret=0
-  delv_with_opts @10.53.0.3 -x 127.0.0.1 > delv.out.test$n 2>&1 || ret=1
+  delv_with_opts @10.53.0.3 -x 127.0.0.1 >delv.out.test$n 2>&1 || ret=1
   # doesn't matter if has answer
-  grep -i "127\\.in-addr\\.arpa\\." < delv.out.test$n > /dev/null || ret=1
+  grep -i "127\\.in-addr\\.arpa\\." <delv.out.test$n >/dev/null || ret=1
   check_ttl_range delv.out.test$n '\\-ANY' 10800 3 || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking delv over TCP works ($n)"
   ret=0
-  delv_with_opts +tcp @10.53.0.3 a a.example > delv.out.test$n || ret=1
-  grep "10\\.0\\.0\\.1$" < delv.out.test$n > /dev/null || ret=1
+  delv_with_opts +tcp @10.53.0.3 a a.example >delv.out.test$n || ret=1
+  grep "10\\.0\\.0\\.1$" <delv.out.test$n >/dev/null || ret=1
   check_ttl_range delv.out.test$n "A" 300 || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking delv +multi +norrcomments works for DNSKEY (when default is rrcomments)($n)"
   ret=0
-  delv_with_opts +tcp @10.53.0.3 +multi +norrcomments DNSKEY example > delv.out.test$n || ret=1
-  grep "; ZSK; alg = $DEFAULT_ALGORITHM ; key id = $KEYID" < delv.out.test$n > /dev/null && ret=1
+  delv_with_opts +tcp @10.53.0.3 +multi +norrcomments DNSKEY example >delv.out.test$n || ret=1
+  grep "; ZSK; alg = $DEFAULT_ALGORITHM ; key id = $KEYID" <delv.out.test$n >/dev/null && ret=1
   check_ttl_range delv.out.test$n "DNSKEY" 300 || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking delv +multi +norrcomments works for SOA (when default is rrcomments)($n)"
   ret=0
-  delv_with_opts +tcp @10.53.0.3 +multi +norrcomments SOA example > delv.out.test$n || ret=1
-  grep "; ZSK; alg = $DEFAULT_ALGORITHM ; key id = $KEYID" < delv.out.test$n > /dev/null && ret=1
+  delv_with_opts +tcp @10.53.0.3 +multi +norrcomments SOA example >delv.out.test$n || ret=1
+  grep "; ZSK; alg = $DEFAULT_ALGORITHM ; key id = $KEYID" <delv.out.test$n >/dev/null && ret=1
   check_ttl_range delv.out.test$n "SOA" 300 || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking delv +rrcomments works for DNSKEY($n)"
   ret=0
-  delv_with_opts +tcp @10.53.0.3 +rrcomments DNSKEY example > delv.out.test$n || ret=1
-  grep "; ZSK; alg = $DEFAULT_ALGORITHM ; key id = $KEYID" < delv.out.test$n > /dev/null || ret=1
+  delv_with_opts +tcp @10.53.0.3 +rrcomments DNSKEY example >delv.out.test$n || ret=1
+  grep "; ZSK; alg = $DEFAULT_ALGORITHM ; key id = $KEYID" <delv.out.test$n >/dev/null || ret=1
   check_ttl_range delv.out.test$n "DNSKEY" 300 || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking delv +short +rrcomments works for DNSKEY ($n)"
   ret=0
-  delv_with_opts +tcp @10.53.0.3 +short +rrcomments DNSKEY example > delv.out.test$n || ret=1
-  grep "; ZSK; alg = $DEFAULT_ALGORITHM ; key id = $KEYID" < delv.out.test$n > /dev/null || ret=1
+  delv_with_opts +tcp @10.53.0.3 +short +rrcomments DNSKEY example >delv.out.test$n || ret=1
+  grep "; ZSK; alg = $DEFAULT_ALGORITHM ; key id = $KEYID" <delv.out.test$n >/dev/null || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking delv +short +rrcomments works ($n)"
   ret=0
-  delv_with_opts +tcp @10.53.0.3 +short +rrcomments DNSKEY example > delv.out.test$n || ret=1
-  grep -q "$KEYDATA  ; ZSK; alg = $DEFAULT_ALGORITHM ; key id = $KEYID" < delv.out.test$n || ret=1
+  delv_with_opts +tcp @10.53.0.3 +short +rrcomments DNSKEY example >delv.out.test$n || ret=1
+  grep -q "$KEYDATA  ; ZSK; alg = $DEFAULT_ALGORITHM ; key id = $KEYID" <delv.out.test$n || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking delv +short +nosplit works ($n)"
   ret=0
-  delv_with_opts +tcp @10.53.0.3 +short +nosplit DNSKEY example > delv.out.test$n || ret=1
-  grep -q "$NOSPLIT" < delv.out.test$n || ret=1
-  test "$(wc -l < delv.out.test$n)" -eq 1 || ret=1
-  test "$(awk '{print NF}' < delv.out.test$n)" -eq 14 || ret=1
+  delv_with_opts +tcp @10.53.0.3 +short +nosplit DNSKEY example >delv.out.test$n || ret=1
+  grep -q "$NOSPLIT" <delv.out.test$n || ret=1
+  test "$(wc -l <delv.out.test$n)" -eq 1 || ret=1
+  test "$(awk '{print NF}' <delv.out.test$n)" -eq 14 || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking delv +short +nosplit +norrcomments works ($n)"
   ret=0
-  delv_with_opts +tcp @10.53.0.3 +short +nosplit +norrcomments DNSKEY example > delv.out.test$n || ret=1
-  grep -q "$NOSPLIT\$" < delv.out.test$n || ret=1
-  test "$(wc -l < delv.out.test$n)" -eq 1 || ret=1
-  test "$(awk '{print NF}' < delv.out.test$n)" -eq 4 || ret=1
+  delv_with_opts +tcp @10.53.0.3 +short +nosplit +norrcomments DNSKEY example >delv.out.test$n || ret=1
+  grep -q "$NOSPLIT\$" <delv.out.test$n || ret=1
+  test "$(wc -l <delv.out.test$n)" -eq 1 || ret=1
+  test "$(awk '{print NF}' <delv.out.test$n)" -eq 4 || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking delv +sp works as an abbriviated form of split ($n)"
   ret=0
-  delv_with_opts @10.53.0.3 +sp=4 -t sshfp foo.example > delv.out.test$n || ret=1
-  grep " 9ABC DEF6 7890 " < delv.out.test$n > /dev/null || ret=1
+  delv_with_opts @10.53.0.3 +sp=4 -t sshfp foo.example >delv.out.test$n || ret=1
+  grep " 9ABC DEF6 7890 " <delv.out.test$n >/dev/null || ret=1
   check_ttl_range delv.out.test$n "SSHFP" 300 || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking delv +sh works as an abbriviated form of short ($n)"
   ret=0
-  delv_with_opts @10.53.0.3 +sh a a.example > delv.out.test$n || ret=1
-  test "$(wc -l < delv.out.test$n)" -eq 1 || ret=1
+  delv_with_opts @10.53.0.3 +sh a a.example >delv.out.test$n || ret=1
+  test "$(wc -l <delv.out.test$n)" -eq 1 || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking delv -c IN works ($n)"
   ret=0
-  delv_with_opts @10.53.0.3 -c IN -t a a.example > delv.out.test$n || ret=1
-  grep "a.example." < delv.out.test$n > /dev/null || ret=1
+  delv_with_opts @10.53.0.3 -c IN -t a a.example >delv.out.test$n || ret=1
+  grep "a.example." <delv.out.test$n >/dev/null || ret=1
   check_ttl_range delv.out.test$n "A" 300 || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking delv -c CH is ignored, and treated like IN ($n)"
   ret=0
-  delv_with_opts @10.53.0.3 -c CH -t a a.example > delv.out.test$n || ret=1
-  grep "a.example." < delv.out.test$n > /dev/null || ret=1
+  delv_with_opts @10.53.0.3 -c CH -t a a.example >delv.out.test$n || ret=1
+  grep "a.example." <delv.out.test$n >/dev/null || ret=1
   check_ttl_range delv.out.test$n "A" 300 || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "checking delv H is ignored, and treated like IN ($n)"
   ret=0
-  delv_with_opts @10.53.0.3 -c CH -t a a.example > delv.out.test$n || ret=1
-  grep "a.example." < delv.out.test$n > /dev/null || ret=1
+  delv_with_opts @10.53.0.3 -c CH -t a a.example >delv.out.test$n || ret=1
+  grep "a.example." <delv.out.test$n >/dev/null || ret=1
   check_ttl_range delv.out.test$n "A" 300 || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "check that delv -q -m works ($n)"
   ret=0
-  delv_with_opts @10.53.0.3 -q -m > delv.out.test$n 2>&1 || ret=1
-  grep '^; -m\..*[0-9]*.*IN.*ANY.*;' delv.out.test$n > /dev/null || ret=1
-  grep "^add " delv.out.test$n > /dev/null && ret=1
-  grep "^del " delv.out.test$n > /dev/null && ret=1
+  delv_with_opts @10.53.0.3 -q -m >delv.out.test$n 2>&1 || ret=1
+  grep '^; -m\..*[0-9]*.*IN.*ANY.*;' delv.out.test$n >/dev/null || ret=1
+  grep "^add " delv.out.test$n >/dev/null && ret=1
+  grep "^del " delv.out.test$n >/dev/null && ret=1
   check_ttl_range delv.out.test$n '\\-ANY' 300 3 || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "check that delv -t ANY works ($n)"
   ret=0
-  delv_with_opts @10.53.0.3 -t ANY example > delv.out.test$n 2>&1 || ret=1
-  grep "^example." < delv.out.test$n > /dev/null || ret=1
+  delv_with_opts @10.53.0.3 -t ANY example >delv.out.test$n 2>&1 || ret=1
+  grep "^example." <delv.out.test$n >/dev/null || ret=1
   check_ttl_range delv.out.test$n NS 300 || ret=1
   check_ttl_range delv.out.test$n SOA 300 || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "check that delv loads key-style trust anchors ($n)"
   ret=0
-  delv_with_opts -a ns3/anchor.dnskey +root=example @10.53.0.3 -t DNSKEY example > delv.out.test$n 2>&1 || ret=1
-  grep "fully validated" delv.out.test$n > /dev/null || ret=1
+  delv_with_opts -a ns3/anchor.dnskey +root=example @10.53.0.3 -t DNSKEY example >delv.out.test$n 2>&1 || ret=1
+  grep "fully validated" delv.out.test$n >/dev/null || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  n=$((n+1))
+  n=$((n + 1))
   echo_i "check that delv loads DS-style trust anchors ($n)"
   ret=0
-  delv_with_opts -a ns3/anchor.ds +root=example @10.53.0.3 -t DNSKEY example > delv.out.test$n 2>&1 || ret=1
-  grep "fully validated" delv.out.test$n > /dev/null || ret=1
+  delv_with_opts -a ns3/anchor.ds +root=example @10.53.0.3 -t DNSKEY example >delv.out.test$n 2>&1 || ret=1
+  grep "fully validated" delv.out.test$n >/dev/null || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
+  status=$((status + ret))
 
-  if [ $HAS_PYYAML -ne 0 ] ; then
-    n=$((n+1))
+  if [ $HAS_PYYAML -ne 0 ]; then
+    n=$((n + 1))
     echo_i "check delv +yaml output ($n)"
     ret=0
-    delv_with_opts +yaml @10.53.0.3 any ns2.example > delv.out.test$n || ret=1
+    delv_with_opts +yaml @10.53.0.3 any ns2.example >delv.out.test$n || ret=1
     value=$($PYTHON yamlget.py delv.out.test$n status || ret=1)
     [ "$value" = "success" ] || ret=1
     value=$($PYTHON yamlget.py delv.out.test$n query_name || ret=1)
     [ "$value" = "ns2.example" ] || ret=1
     value=$($PYTHON yamlget.py delv.out.test$n records 0 answer_not_validated 0 || ret=1)
-    count=$(echo $value | wc -w )
+    count=$(echo $value | wc -w)
     [ ${count:-0} -eq 5 ] || ret=1
     if [ $ret -ne 0 ]; then echo_i "failed"; fi
-    status=$((status+ret))
+    status=$((status + ret))
   fi
 else
   echo_i "$DELV is needed, so skipping these delv tests"