Merging upstream version 1:9.16.48.

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

3 files changed, 157 insertions, 170 deletions

diff --git a/bin/tests/system/geoip2/prereq.sh b/bin/tests/system/geoip2/prereq.sh
index 8d8528f..5626eef 100644
--- a/bin/tests/system/geoip2/prereq.sh
+++ b/bin/tests/system/geoip2/prereq.sh
@@ -15,7 +15,7 @@ SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
 $FEATURETEST --have-geoip2 || {
-	echo_i "This test requires GeoIP support." >&2
-	exit 255
+  echo_i "This test requires GeoIP support." >&2
+  exit 255
 }
 exit 0
diff --git a/bin/tests/system/geoip2/setup.sh b/bin/tests/system/geoip2/setup.sh
index 22d3c46..c92fc46 100644
--- a/bin/tests/system/geoip2/setup.sh
+++ b/bin/tests/system/geoip2/setup.sh
@@ -19,6 +19,6 @@ $SHELL clean.sh
 copy_setports ns2/named1.conf.in ns2/named.conf
 
 for i in 1 2 3 4 5 6 7 other bogus; do
-        cp ns2/example.db.in ns2/example${i}.db
-        echo "@ IN TXT \"$i\"" >> ns2/example$i.db
+  cp ns2/example.db.in ns2/example${i}.db
+  echo "@ IN TXT \"$i\"" >>ns2/example$i.db
 done
diff --git a/bin/tests/system/geoip2/tests.sh b/bin/tests/system/geoip2/tests.sh
index 77b6f93..ee5e1d7 100644
--- a/bin/tests/system/geoip2/tests.sh
+++ b/bin/tests/system/geoip2/tests.sh
@@ -23,55 +23,52 @@ DIGOPTS="+tcp +short -p ${PORT} @10.53.0.2"
 DIGOPTS6="+tcp +short -p ${PORT} @fd92:7065:b8e:ffff::2 -6"
 RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p ${CONTROLPORT} -s"
 
-for conf in conf/good*.conf
-do
-	n=`expr $n + 1`
-	echo_i "checking that $conf is accepted ($n)"
-	ret=0
-	$CHECKCONF "$conf" || ret=1
-	if [ $ret != 0 ]; then echo_i "failed"; fi
-	status=`expr $status + $ret`
+for conf in conf/good*.conf; do
+  n=$(expr $n + 1)
+  echo_i "checking that $conf is accepted ($n)"
+  ret=0
+  $CHECKCONF "$conf" || ret=1
+  if [ $ret != 0 ]; then echo_i "failed"; fi
+  status=$(expr $status + $ret)
 done
 
-for conf in conf/bad*.conf
-do
-	n=`expr $n + 1`
-	echo_i "checking that $conf is rejected ($n)"
-	ret=0
-	$CHECKCONF "$conf" >/dev/null && ret=1
-	if [ $ret != 0 ]; then echo_i "failed"; fi
-	status=`expr $status + $ret`
+for conf in conf/bad*.conf; do
+  n=$(expr $n + 1)
+  echo_i "checking that $conf is rejected ($n)"
+  ret=0
+  $CHECKCONF "$conf" >/dev/null && ret=1
+  if [ $ret != 0 ]; then echo_i "failed"; fi
+  status=$(expr $status + $ret)
 done
 
-n=`expr $n + 1`
+n=$(expr $n + 1)
 echo_i "checking Country database by code using IPv4 ($n)"
 ret=0
 lret=0
 for i in 1 2 3 4 5 6 7; do
-    $DIG $DIGOPTS txt example -b 10.53.0.$i > dig.out.ns2.test$n.$i || lret=1
-    j=`cat dig.out.ns2.test$n.$i | tr -d '"'`
-    [ "$i" = "$j" ] || lret=1
-    [ $lret -eq 1 ] && break
+  $DIG $DIGOPTS txt example -b 10.53.0.$i >dig.out.ns2.test$n.$i || lret=1
+  j=$(cat dig.out.ns2.test$n.$i | tr -d '"')
+  [ "$i" = "$j" ] || lret=1
+  [ $lret -eq 1 ] && break
 done
 [ $lret -eq 1 ] && ret=1
 [ $ret -eq 0 ] || echo_i "failed"
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
-if testsock6 fd92:7065:b8e:ffff::3
-then
-  n=`expr $n + 1`
+if testsock6 fd92:7065:b8e:ffff::3; then
+  n=$(expr $n + 1)
   echo_i "checking Country database by code using IPv6 ($n)"
   ret=0
   lret=0
   for i in 1 2 3 4 5 6 7; do
-    $DIG $DIGOPTS6 txt example -b fd92:7065:b8e:ffff::$i > dig.out.ns2.test$n.$i || lret=1
-    j=`cat dig.out.ns2.test$n.$i | tr -d '"'`
+    $DIG $DIGOPTS6 txt example -b fd92:7065:b8e:ffff::$i >dig.out.ns2.test$n.$i || lret=1
+    j=$(cat dig.out.ns2.test$n.$i | tr -d '"')
     [ "$i" = "$j" ] || lret=1
     [ $lret -eq 1 ] && break
   done
   [ $lret -eq 1 ] && ret=1
   [ $ret -eq 0 ] || echo_i "failed"
-  status=`expr $status + $ret`
+  status=$(expr $status + $ret)
 else
   echo_i "IPv6 unavailable; skipping IPv6 country code test"
 fi
@@ -82,35 +79,34 @@ $CHECKCONF ns2/named.conf | cat_i
 rndc_reload ns2 10.53.0.2
 sleep 3
 
-n=`expr $n + 1`
+n=$(expr $n + 1)
 echo_i "checking Country database with nested ACLs using IPv4 ($n)"
 ret=0
 lret=0
 for i in 1 2 3 4 5 6 7; do
-    $DIG $DIGOPTS txt example -b 10.53.0.$i > dig.out.ns2.test$n.$i || lret=1
-    j=`cat dig.out.ns2.test$n.$i | tr -d '"'`
-    [ "$i" = "$j" ] || lret=1
-    [ $lret -eq 1 ] && break
+  $DIG $DIGOPTS txt example -b 10.53.0.$i >dig.out.ns2.test$n.$i || lret=1
+  j=$(cat dig.out.ns2.test$n.$i | tr -d '"')
+  [ "$i" = "$j" ] || lret=1
+  [ $lret -eq 1 ] && break
 done
 [ $lret -eq 1 ] && ret=1
 [ $ret -eq 0 ] || echo_i "failed"
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
-if testsock6 fd92:7065:b8e:ffff::3
-then
-  n=`expr $n + 1`
+if testsock6 fd92:7065:b8e:ffff::3; then
+  n=$(expr $n + 1)
   echo_i "checking Country database with nested ACLs using IPv6 ($n)"
   ret=0
   lret=0
   for i in 1 2 3 4 5 6 7; do
-    $DIG $DIGOPTS6 txt example -b fd92:7065:b8e:ffff::$i > dig.out.ns2.test$n.$i || lret=1
-      j=`cat dig.out.ns2.test$n.$i | tr -d '"'`
-      [ "$i" = "$j" ] || lret=1
-      [ $lret -eq 1 ] && break
+    $DIG $DIGOPTS6 txt example -b fd92:7065:b8e:ffff::$i >dig.out.ns2.test$n.$i || lret=1
+    j=$(cat dig.out.ns2.test$n.$i | tr -d '"')
+    [ "$i" = "$j" ] || lret=1
+    [ $lret -eq 1 ] && break
   done
   [ $lret -eq 1 ] && ret=1
   [ $ret -eq 0 ] || echo_i "failed"
-  status=`expr $status + $ret`
+  status=$(expr $status + $ret)
 else
   echo_i "IPv6 unavailable; skipping IPv6 country nested ACL test"
 fi
@@ -121,35 +117,34 @@ $CHECKCONF ns2/named.conf | cat_i
 rndc_reload ns2 10.53.0.2
 sleep 3
 
-n=`expr $n + 1`
+n=$(expr $n + 1)
 echo_i "checking Country database by name using IPv4 ($n)"
 ret=0
 lret=0
 for i in 1 2 3 4 5 6 7; do
-    $DIG $DIGOPTS txt example -b 10.53.0.$i > dig.out.ns2.test$n.$i || lret=1
-    j=`cat dig.out.ns2.test$n.$i | tr -d '"'`
-    [ "$i" = "$j" ] || lret=1
-    [ $lret -eq 1 ] && break
+  $DIG $DIGOPTS txt example -b 10.53.0.$i >dig.out.ns2.test$n.$i || lret=1
+  j=$(cat dig.out.ns2.test$n.$i | tr -d '"')
+  [ "$i" = "$j" ] || lret=1
+  [ $lret -eq 1 ] && break
 done
 [ $lret -eq 1 ] && ret=1
 [ $ret -eq 0 ] || echo_i "failed"
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
-if testsock6 fd92:7065:b8e:ffff::3
-then
-  n=`expr $n + 1`
+if testsock6 fd92:7065:b8e:ffff::3; then
+  n=$(expr $n + 1)
   echo_i "checking Country database by name using IPv6 ($n)"
   ret=0
   lret=0
   for i in 1 2 3 4 5 6 7; do
-    $DIG $DIGOPTS6 txt example -b fd92:7065:b8e:ffff::$i > dig.out.ns2.test$n.$i || lret=1
-    j=`cat dig.out.ns2.test$n.$i | tr -d '"'`
+    $DIG $DIGOPTS6 txt example -b fd92:7065:b8e:ffff::$i >dig.out.ns2.test$n.$i || lret=1
+    j=$(cat dig.out.ns2.test$n.$i | tr -d '"')
     [ "$i" = "$j" ] || lret=1
     [ $lret -eq 1 ] && break
   done
   [ $lret -eq 1 ] && ret=1
   [ $ret -eq 0 ] || echo_i "failed"
-  status=`expr $status + $ret`
+  status=$(expr $status + $ret)
 else
   echo_i "IPv6 unavailable; skipping IPv6 country name test"
 fi
@@ -160,37 +155,36 @@ $CHECKCONF ns2/named.conf | cat_i
 rndc_reload ns2 10.53.0.2
 sleep 3
 
-n=`expr $n + 1`
+n=$(expr $n + 1)
 echo_i "checking Country database by continent code using IPv4 ($n)"
 ret=0
 lret=0
 # deliberately skipping 4 and 6 as they have duplicate continents
 for i in 1 2 3 5 7; do
-    $DIG $DIGOPTS txt example -b 10.53.0.$i > dig.out.ns2.test$n.$i || lret=1
-    j=`cat dig.out.ns2.test$n.$i | tr -d '"'`
-    [ "$i" = "$j" ] || lret=1
-    [ $lret -eq 1 ] && break
+  $DIG $DIGOPTS txt example -b 10.53.0.$i >dig.out.ns2.test$n.$i || lret=1
+  j=$(cat dig.out.ns2.test$n.$i | tr -d '"')
+  [ "$i" = "$j" ] || lret=1
+  [ $lret -eq 1 ] && break
 done
 [ $lret -eq 1 ] && ret=1
 [ $ret -eq 0 ] || echo_i "failed"
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
-if testsock6 fd92:7065:b8e:ffff::3
-then
-  n=`expr $n + 1`
+if testsock6 fd92:7065:b8e:ffff::3; then
+  n=$(expr $n + 1)
   echo_i "checking Country database by continent code using IPv6 ($n)"
   ret=0
   lret=0
   # deliberately skipping 4 and 6 as they have duplicate continents
   for i in 1 2 3 5 7; do
-    $DIG $DIGOPTS6 txt example -b fd92:7065:b8e:ffff::$i > dig.out.ns2.test$n.$i || lret=1
-    j=`cat dig.out.ns2.test$n.$i | tr -d '"'`
+    $DIG $DIGOPTS6 txt example -b fd92:7065:b8e:ffff::$i >dig.out.ns2.test$n.$i || lret=1
+    j=$(cat dig.out.ns2.test$n.$i | tr -d '"')
     [ "$i" = "$j" ] || lret=1
     [ $lret -eq 1 ] && break
   done
   [ $lret -eq 1 ] && ret=1
   [ $ret -eq 0 ] || echo_i "failed"
-  status=`expr $status + $ret`
+  status=$(expr $status + $ret)
 else
   echo_i "IPv6 unavailable; skipping IPv6 continent code test"
 fi
@@ -201,77 +195,75 @@ $CHECKCONF ns2/named.conf | cat_i
 rndc_reload ns2 10.53.0.2
 sleep 3
 
-n=`expr $n + 1`
+n=$(expr $n + 1)
 echo_i "checking City database by region code using IPv4 ($n)"
 ret=0
 lret=0
 # skipping 2 on purpose here; it has the same region code as 1
 for i in 1 3 4 5 6 7; do
-    $DIG $DIGOPTS txt example -b 10.53.0.$i > dig.out.ns2.test$n.$i || lret=1
-    j=`cat dig.out.ns2.test$n.$i | tr -d '"'`
-    [ "$i" = "$j" ] || lret=1
-    [ $lret -eq 1 ] && break
+  $DIG $DIGOPTS txt example -b 10.53.0.$i >dig.out.ns2.test$n.$i || lret=1
+  j=$(cat dig.out.ns2.test$n.$i | tr -d '"')
+  [ "$i" = "$j" ] || lret=1
+  [ $lret -eq 1 ] && break
 done
 [ $lret -eq 1 ] && ret=1
 [ $ret -eq 0 ] || echo_i "failed"
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
-if testsock6 fd92:7065:b8e:ffff::3
-then
-  n=`expr $n + 1`
+if testsock6 fd92:7065:b8e:ffff::3; then
+  n=$(expr $n + 1)
   echo_i "checking City database by region code using IPv6 ($n)"
   ret=0
   lret=0
-# skipping 2 on purpose here; it has the same region code as 1
+  # skipping 2 on purpose here; it has the same region code as 1
   for i in 1 3 4 5 6 7; do
-    $DIG $DIGOPTS6 txt example -b fd92:7065:b8e:ffff::$i > dig.out.ns2.test$n.$i || lret=1
-    j=`cat dig.out.ns2.test$n.$i | tr -d '"'`
+    $DIG $DIGOPTS6 txt example -b fd92:7065:b8e:ffff::$i >dig.out.ns2.test$n.$i || lret=1
+    j=$(cat dig.out.ns2.test$n.$i | tr -d '"')
     [ "$i" = "$j" ] || lret=1
     [ $lret -eq 1 ] && break
   done
   [ $lret -eq 1 ] && ret=1
   [ $ret -eq 0 ] || echo_i "failed"
-  status=`expr $status + $ret`
+  status=$(expr $status + $ret)
 else
   echo_i "IPv6 unavailable; skipping IPv6 region code test"
 fi
 
-n=`expr $n + 1`
+n=$(expr $n + 1)
 echo_i "reloading server"
 copy_setports ns2/named6.conf.in ns2/named.conf
 $CHECKCONF ns2/named.conf | cat_i
 rndc_reload ns2 10.53.0.2
 sleep 3
 
-n=`expr $n + 1`
+n=$(expr $n + 1)
 echo_i "checking City database by city name using IPv4 ($n)"
 ret=0
 lret=0
 for i in 1 2 3 4 5 6 7; do
-    $DIG $DIGOPTS txt example -b 10.53.0.$i > dig.out.ns2.test$n.$i || lret=1
-    j=`cat dig.out.ns2.test$n.$i | tr -d '"'`
-    [ "$i" = "$j" ] || lret=1
-    [ $lret -eq 1 ] && break
+  $DIG $DIGOPTS txt example -b 10.53.0.$i >dig.out.ns2.test$n.$i || lret=1
+  j=$(cat dig.out.ns2.test$n.$i | tr -d '"')
+  [ "$i" = "$j" ] || lret=1
+  [ $lret -eq 1 ] && break
 done
 [ $lret -eq 1 ] && ret=1
 [ $ret -eq 0 ] || echo_i "failed"
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
-if testsock6 fd92:7065:b8e:ffff::3
-then
-  n=`expr $n + 1`
+if testsock6 fd92:7065:b8e:ffff::3; then
+  n=$(expr $n + 1)
   echo_i "checking City database by city name using IPv6 ($n)"
   ret=0
   lret=0
   for i in 1 2 3 4 5 6 7; do
-    $DIG $DIGOPTS6 txt example -b fd92:7065:b8e:ffff::$i > dig.out.ns2.test$n.$i || lret=1
-    j=`cat dig.out.ns2.test$n.$i | tr -d '"'`
+    $DIG $DIGOPTS6 txt example -b fd92:7065:b8e:ffff::$i >dig.out.ns2.test$n.$i || lret=1
+    j=$(cat dig.out.ns2.test$n.$i | tr -d '"')
     [ "$i" = "$j" ] || lret=1
     [ $lret -eq 1 ] && break
   done
   [ $lret -eq 1 ] && ret=1
   [ $ret -eq 0 ] || echo_i "failed"
-  status=`expr $status + $ret`
+  status=$(expr $status + $ret)
 else
   echo_i "IPv6 unavailable; skipping IPv6 city test"
 fi
@@ -282,35 +274,34 @@ $CHECKCONF ns2/named.conf | cat_i
 rndc_reload ns2 10.53.0.2
 sleep 3
 
-n=`expr $n + 1`
+n=$(expr $n + 1)
 echo_i "checking ISP database using IPv4 ($n)"
 ret=0
 lret=0
 for i in 1 2 3 4 5 6 7; do
-    $DIG $DIGOPTS txt example -b 10.53.0.$i > dig.out.ns2.test$n.$i || lret=1
-    j=`cat dig.out.ns2.test$n.$i | tr -d '"'`
-    [ "$i" = "$j" ] || lret=1
-    [ $lret -eq 1 ] && break
+  $DIG $DIGOPTS txt example -b 10.53.0.$i >dig.out.ns2.test$n.$i || lret=1
+  j=$(cat dig.out.ns2.test$n.$i | tr -d '"')
+  [ "$i" = "$j" ] || lret=1
+  [ $lret -eq 1 ] && break
 done
 [ $lret -eq 1 ] && ret=1
 [ $ret -eq 0 ] || echo_i "failed"
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
-if testsock6 fd92:7065:b8e:ffff::3
-then
-  n=`expr $n + 1`
+if testsock6 fd92:7065:b8e:ffff::3; then
+  n=$(expr $n + 1)
   echo_i "checking ISP database using IPv6 ($n)"
   ret=0
   lret=0
   for i in 1 2 3 4 5 6 7; do
-    $DIG $DIGOPTS6 txt example -b fd92:7065:b8e:ffff::$i > dig.out.ns2.test$n.$i || lret=1
-      j=`cat dig.out.ns2.test$n.$i | tr -d '"'`
-      [ "$i" = "$j" ] || lret=1
-      [ $lret -eq 1 ] && break
+    $DIG $DIGOPTS6 txt example -b fd92:7065:b8e:ffff::$i >dig.out.ns2.test$n.$i || lret=1
+    j=$(cat dig.out.ns2.test$n.$i | tr -d '"')
+    [ "$i" = "$j" ] || lret=1
+    [ $lret -eq 1 ] && break
   done
   [ $lret -eq 1 ] && ret=1
   [ $ret -eq 0 ] || echo_i "failed"
-  status=`expr $status + $ret`
+  status=$(expr $status + $ret)
 else
   echo_i "IPv6 unavailable; skipping IPv6 ISP test"
 fi
@@ -321,35 +312,34 @@ $CHECKCONF ns2/named.conf | cat_i
 rndc_reload ns2 10.53.0.2
 sleep 3
 
-n=`expr $n + 1`
+n=$(expr $n + 1)
 echo_i "checking ASN database by org name using IPv4 ($n)"
 ret=0
 lret=0
 for i in 1 2 3 4 5 6 7; do
-    $DIG $DIGOPTS txt example -b 10.53.0.$i > dig.out.ns2.test$n.$i || lret=1
-    j=`cat dig.out.ns2.test$n.$i | tr -d '"'`
-    [ "$i" = "$j" ] || lret=1
-    [ $lret -eq 1 ] && break
+  $DIG $DIGOPTS txt example -b 10.53.0.$i >dig.out.ns2.test$n.$i || lret=1
+  j=$(cat dig.out.ns2.test$n.$i | tr -d '"')
+  [ "$i" = "$j" ] || lret=1
+  [ $lret -eq 1 ] && break
 done
 [ $lret -eq 1 ] && ret=1
 [ $ret -eq 0 ] || echo_i "failed"
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
-if testsock6 fd92:7065:b8e:ffff::3
-then
-  n=`expr $n + 1`
+if testsock6 fd92:7065:b8e:ffff::3; then
+  n=$(expr $n + 1)
   echo_i "checking ASN database by org name using IPv6 ($n)"
   ret=0
   lret=0
   for i in 1 2 3 4 5 6 7; do
-    $DIG $DIGOPTS6 txt example -b fd92:7065:b8e:ffff::$i > dig.out.ns2.test$n.$i || lret=1
-      j=`cat dig.out.ns2.test$n.$i | tr -d '"'`
-      [ "$i" = "$j" ] || lret=1
-      [ $lret -eq 1 ] && break
+    $DIG $DIGOPTS6 txt example -b fd92:7065:b8e:ffff::$i >dig.out.ns2.test$n.$i || lret=1
+    j=$(cat dig.out.ns2.test$n.$i | tr -d '"')
+    [ "$i" = "$j" ] || lret=1
+    [ $lret -eq 1 ] && break
   done
   [ $lret -eq 1 ] && ret=1
   [ $ret -eq 0 ] || echo_i "failed"
-  status=`expr $status + $ret`
+  status=$(expr $status + $ret)
 else
   echo_i "IPv6 unavailable; skipping IPv6 ASN test"
 fi
@@ -360,35 +350,34 @@ $CHECKCONF ns2/named.conf | cat_i
 rndc_reload ns2 10.53.0.2
 sleep 3
 
-n=`expr $n + 1`
+n=$(expr $n + 1)
 echo_i "checking GeoIP6 ASN database, ASNNNN only, using IPv4 ($n)"
 ret=0
 lret=0
 for i in 1 2 3 4 5 6 7; do
-    $DIG $DIGOPTS txt example -b 10.53.0.$i > dig.out.ns2.test$n.$i || lret=1
-    j=`cat dig.out.ns2.test$n.$i | tr -d '"'`
-    [ "$i" = "$j" ] || lret=1
-    [ $lret -eq 1 ] && break
+  $DIG $DIGOPTS txt example -b 10.53.0.$i >dig.out.ns2.test$n.$i || lret=1
+  j=$(cat dig.out.ns2.test$n.$i | tr -d '"')
+  [ "$i" = "$j" ] || lret=1
+  [ $lret -eq 1 ] && break
 done
 [ $lret -eq 1 ] && ret=1
 [ $ret -eq 0 ] || echo_i "failed"
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
-if testsock6 fd92:7065:b8e:ffff::3
-then
-  n=`expr $n + 1`
+if testsock6 fd92:7065:b8e:ffff::3; then
+  n=$(expr $n + 1)
   echo_i "checking ASN database, ASNNNN only, using IPv6 ($n)"
   ret=0
   lret=0
   for i in 1 2 3 4 5 6 7; do
-    $DIG $DIGOPTS6 txt example -b fd92:7065:b8e:ffff::$i > dig.out.ns2.test$n.$i || lret=1
-      j=`cat dig.out.ns2.test$n.$i | tr -d '"'`
-      [ "$i" = "$j" ] || lret=1
-      [ $lret -eq 1 ] && break
+    $DIG $DIGOPTS6 txt example -b fd92:7065:b8e:ffff::$i >dig.out.ns2.test$n.$i || lret=1
+    j=$(cat dig.out.ns2.test$n.$i | tr -d '"')
+    [ "$i" = "$j" ] || lret=1
+    [ $lret -eq 1 ] && break
   done
   [ $lret -eq 1 ] && ret=1
   [ $ret -eq 0 ] || echo_i "failed"
-  status=`expr $status + $ret`
+  status=$(expr $status + $ret)
 else
   echo_i "IPv6 unavailable; skipping IPv6 ASN test"
 fi
@@ -399,35 +388,34 @@ $CHECKCONF ns2/named.conf | cat_i
 rndc_reload ns2 10.53.0.2
 sleep 3
 
-n=`expr $n + 1`
+n=$(expr $n + 1)
 echo_i "checking GeoIP6 ASN database, NNNN only, using IPv4 ($n)"
 ret=0
 lret=0
 for i in 1 2 3 4 5 6 7; do
-    $DIG $DIGOPTS txt example -b 10.53.0.$i > dig.out.ns2.test$n.$i || lret=1
-    j=`cat dig.out.ns2.test$n.$i | tr -d '"'`
-    [ "$i" = "$j" ] || lret=1
-    [ $lret -eq 1 ] && break
+  $DIG $DIGOPTS txt example -b 10.53.0.$i >dig.out.ns2.test$n.$i || lret=1
+  j=$(cat dig.out.ns2.test$n.$i | tr -d '"')
+  [ "$i" = "$j" ] || lret=1
+  [ $lret -eq 1 ] && break
 done
 [ $lret -eq 1 ] && ret=1
 [ $ret -eq 0 ] || echo_i "failed"
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
-if testsock6 fd92:7065:b8e:ffff::3
-then
-  n=`expr $n + 1`
+if testsock6 fd92:7065:b8e:ffff::3; then
+  n=$(expr $n + 1)
   echo_i "checking ASN database, NNNN only, using IPv6 ($n)"
   ret=0
   lret=0
   for i in 1 2 3 4 5 6 7; do
-    $DIG $DIGOPTS6 txt example -b fd92:7065:b8e:ffff::$i > dig.out.ns2.test$n.$i || lret=1
-      j=`cat dig.out.ns2.test$n.$i | tr -d '"'`
-      [ "$i" = "$j" ] || lret=1
-      [ $lret -eq 1 ] && break
+    $DIG $DIGOPTS6 txt example -b fd92:7065:b8e:ffff::$i >dig.out.ns2.test$n.$i || lret=1
+    j=$(cat dig.out.ns2.test$n.$i | tr -d '"')
+    [ "$i" = "$j" ] || lret=1
+    [ $lret -eq 1 ] && break
   done
   [ $lret -eq 1 ] && ret=1
   [ $ret -eq 0 ] || echo_i "failed"
-  status=`expr $status + $ret`
+  status=$(expr $status + $ret)
 else
   echo_i "IPv6 unavailable; skipping IPv6 ASN test"
 fi
@@ -438,35 +426,34 @@ $CHECKCONF ns2/named.conf | cat_i
 rndc_reload ns2 10.53.0.2
 sleep 3
 
-n=`expr $n + 1`
+n=$(expr $n + 1)
 echo_i "checking Domain database using IPv4 ($n)"
 ret=0
 lret=0
 for i in 1 2 3 4 5 6 7; do
-    $DIG $DIGOPTS txt example -b 10.53.0.$i > dig.out.ns2.test$n.$i || lret=1
-    j=`cat dig.out.ns2.test$n.$i | tr -d '"'`
-    [ "$i" = "$j" ] || lret=1
-    [ $lret -eq 1 ] && break
+  $DIG $DIGOPTS txt example -b 10.53.0.$i >dig.out.ns2.test$n.$i || lret=1
+  j=$(cat dig.out.ns2.test$n.$i | tr -d '"')
+  [ "$i" = "$j" ] || lret=1
+  [ $lret -eq 1 ] && break
 done
 [ $lret -eq 1 ] && ret=1
 [ $ret -eq 0 ] || echo_i "failed"
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
-if testsock6 fd92:7065:b8e:ffff::3
-then
-  n=`expr $n + 1`
+if testsock6 fd92:7065:b8e:ffff::3; then
+  n=$(expr $n + 1)
   echo_i "checking Domain database using IPv6 ($n)"
   ret=0
   lret=0
   for i in 1 2 3 4 5 6 7; do
-    $DIG $DIGOPTS6 txt example -b fd92:7065:b8e:ffff::$i > dig.out.ns2.test$n.$i || lret=1
-      j=`cat dig.out.ns2.test$n.$i | tr -d '"'`
-      [ "$i" = "$j" ] || lret=1
-      [ $lret -eq 1 ] && break
+    $DIG $DIGOPTS6 txt example -b fd92:7065:b8e:ffff::$i >dig.out.ns2.test$n.$i || lret=1
+    j=$(cat dig.out.ns2.test$n.$i | tr -d '"')
+    [ "$i" = "$j" ] || lret=1
+    [ $lret -eq 1 ] && break
   done
   [ $lret -eq 1 ] && ret=1
   [ $ret -eq 0 ] || echo_i "failed"
-  status=`expr $status + $ret`
+  status=$(expr $status + $ret)
 else
   echo_i "IPv6 unavailable; skipping IPv6 Domain test"
 fi
@@ -477,13 +464,13 @@ $CHECKCONF ns2/named.conf | cat_i
 rndc_reload ns2 10.53.0.2
 sleep 3
 
-n=`expr $n + 1`
+n=$(expr $n + 1)
 echo_i "checking geoip blackhole ACL ($n)"
 ret=0
-$DIG $DIGOPTS txt example -b 10.53.0.7 > dig.out.ns2.test$n || ret=1
-$RNDCCMD 10.53.0.2 status 2>&1 > rndc.out.ns2.test$n || ret=1
+$DIG $DIGOPTS txt example -b 10.53.0.7 >dig.out.ns2.test$n || ret=1
+$RNDCCMD 10.53.0.2 status 2>&1 >rndc.out.ns2.test$n || ret=1
 [ $ret -eq 0 ] || echo_i "failed"
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
 echo_i "exit status: $status"
 [ $status -eq 0 ] || exit 1