Merging upstream version 1:9.16.48.

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

2 files changed, 25 insertions, 25 deletions

diff --git a/bin/tests/system/nzd2nzf/prereq.sh b/bin/tests/system/nzd2nzf/prereq.sh
index 5498945..df7e8c6 100644
--- a/bin/tests/system/nzd2nzf/prereq.sh
+++ b/bin/tests/system/nzd2nzf/prereq.sh
@@ -13,8 +13,8 @@ SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
 if ! $FEATURETEST --with-lmdb; then
-        echo_i "This test requires LMDB support (--with-lmdb)"
-        exit 255
+  echo_i "This test requires LMDB support (--with-lmdb)"
+  exit 255
 fi
 
 exit 0
diff --git a/bin/tests/system/nzd2nzf/tests.sh b/bin/tests/system/nzd2nzf/tests.sh
index 9f86d4a..7a95373 100644
--- a/bin/tests/system/nzd2nzf/tests.sh
+++ b/bin/tests/system/nzd2nzf/tests.sh
@@ -20,41 +20,41 @@ RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p ${CONTROLPORT} -s"
 status=0
 n=0
 
-n=`expr $n + 1`
+n=$(expr $n + 1)
 echo_i "querying for non-existing zone data ($n)"
 ret=0
-$DIG $DIGOPTS @10.53.0.1 a.added.example a > dig.out.ns1.$n || ret=1
-grep 'status: REFUSED' dig.out.ns1.$n > /dev/null || ret=1
+$DIG $DIGOPTS @10.53.0.1 a.added.example a >dig.out.ns1.$n || ret=1
+grep 'status: REFUSED' dig.out.ns1.$n >/dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
-n=`expr $n + 1`
+n=$(expr $n + 1)
 echo_i "adding a new zone into default NZD using rndc addzone ($n)"
 $RNDCCMD 10.53.0.1 addzone "added.example { type master; file \"added.db\"; };" 2>&1 | sed 's/^/I:ns1 /' | cat_i
 sleep 2
 
-n=`expr $n + 1`
+n=$(expr $n + 1)
 echo_i "querying for existing zone data ($n)"
 ret=0
-$DIG $DIGOPTS @10.53.0.1 a.added.example a > dig.out.ns1.$n || ret=1
-grep 'status: NOERROR' dig.out.ns1.$n > /dev/null || ret=1
+$DIG $DIGOPTS @10.53.0.1 a.added.example a >dig.out.ns1.$n || ret=1
+grep 'status: NOERROR' dig.out.ns1.$n >/dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
 echo_i "stopping ns1"
 stop_server ns1
 
-n=`expr $n + 1`
+n=$(expr $n + 1)
 echo_i "dumping _default.nzd to _default.nzf ($n)"
-$NZD2NZF ns1/_default.nzd > ns1/_default.nzf || ret=1
+$NZD2NZF ns1/_default.nzd >ns1/_default.nzf || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
-n=`expr $n + 1`
+n=$(expr $n + 1)
 echo_i "checking that _default.nzf contains the expected content ($n)"
-grep 'zone "added.example" { type master; file "added.db"; };' ns1/_default.nzf > /dev/null || ret=1
+grep 'zone "added.example" { type master; file "added.db"; };' ns1/_default.nzf >/dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
 echo_i "deleting _default.nzd database"
 rm -f ns1/_default.nzd
@@ -62,19 +62,19 @@ rm -f ns1/_default.nzd
 echo_i "starting ns1 which should migrate the .nzf to .nzd"
 start_server --noclean --restart --port ${PORT} ns1
 
-n=`expr $n + 1`
+n=$(expr $n + 1)
 echo_i "querying for zone data from migrated zone config ($n)"
 # retry loop in case the server restart above causes transient failures
 for try in 0 1 2 3 4 5 6 7 8 9; do
-    ret=0
-    $DIG $DIGOPTS @10.53.0.1 a.added.example a > dig.out.ns1.$n || ret=1
-    grep 'status: NOERROR' dig.out.ns1.$n > /dev/null || ret=1
-    [ "$ret" -eq 0 ] && break
-    sleep 1
+  ret=0
+  $DIG $DIGOPTS @10.53.0.1 a.added.example a >dig.out.ns1.$n || ret=1
+  grep 'status: NOERROR' dig.out.ns1.$n >/dev/null || ret=1
+  [ "$ret" -eq 0 ] && break
+  sleep 1
 done
-n=`expr $n + 1`
+n=$(expr $n + 1)
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
 echo_i "exit status: $status"
 exit $status