Merging upstream version 1:9.16.48.

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

2 files changed, 97 insertions, 98 deletions

diff --git a/bin/tests/system/tkey/ns1/setup.sh b/bin/tests/system/tkey/ns1/setup.sh
index 6471905..716332f 100644
--- a/bin/tests/system/tkey/ns1/setup.sh
+++ b/bin/tests/system/tkey/ns1/setup.sh
@@ -14,7 +14,7 @@
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
 
-keyname=`$KEYGEN -T KEY -a DH -b 768 -n host server`
+keyname=$($KEYGEN -T KEY -a DH -b 768 -n host server)
 keyid=$(keyfile_to_key_id $keyname)
 rm -f named.conf
-sed -e "s;KEYID;$keyid;" < named.conf.in > named.conf
+sed -e "s;KEYID;$keyid;" <named.conf.in >named.conf
diff --git a/bin/tests/system/tkey/tests.sh b/bin/tests/system/tkey/tests.sh
index ca466e4..f9b274e 100644
--- a/bin/tests/system/tkey/tests.sh
+++ b/bin/tests/system/tkey/tests.sh
@@ -21,140 +21,139 @@ n=1
 
 echo_i "generating new DH key ($n)"
 ret=0
-dhkeyname=`$KEYGEN -T KEY -a DH -b 768 -n host client` || ret=1
+dhkeyname=$($KEYGEN -T KEY -a DH -b 768 -n host client) || ret=1
 if [ $ret != 0 ]; then
-	echo_i "failed"
-	status=$((status+ret))
-	echo_i "exit status: $status"
-	exit $status
+  echo_i "failed"
+  status=$((status + ret))
+  echo_i "exit status: $status"
+  exit $status
 fi
-status=`expr $status + $ret`
-n=$((n+1))
-
-for owner in . foo.example.
-do
-	echo_i "creating new key using owner name \"$owner\" ($n)"
-	ret=0
-	keyname=`$KEYCREATE $dhkeyname $owner` || ret=1
-	if [ $ret != 0 ]; then
-		echo_i "failed"
-		status=$((status+ret))
-		echo_i "exit status: $status"
-		exit $status
-	fi
-	status=`expr $status + $ret`
-	n=$((n+1))
-
-	echo_i "checking the new key ($n)"
-	ret=0
-	$DIG $DIGOPTS txt txt.example -k $keyname > dig.out.1 || ret=1
-	grep "status: NOERROR" dig.out.1 > /dev/null || ret=1
-	grep "TSIG.*hmac-md5.*NOERROR" dig.out.1 > /dev/null || ret=1
-	grep "Some TSIG could not be validated" dig.out.1 > /dev/null && ret=1
-	if [ $ret != 0 ]; then
-		echo_i "failed"
-	fi
-	status=`expr $status + $ret`
-	n=$((n+1))
-
-	echo_i "deleting new key ($n)"
-	ret=0
-	$KEYDELETE $keyname || ret=1
-	if [ $ret != 0 ]; then
-		echo_i "failed"
-	fi
-	status=`expr $status + $ret`
-	n=$((n+1))
-
-	echo_i "checking that new key has been deleted ($n)"
-	ret=0
-	$DIG $DIGOPTS txt txt.example -k $keyname > dig.out.2 || ret=1
-	grep "status: NOERROR" dig.out.2 > /dev/null && ret=1
-	grep "TSIG.*hmac-md5.*NOERROR" dig.out.2 > /dev/null && ret=1
-	grep "Some TSIG could not be validated" dig.out.2 > /dev/null || ret=1
-	if [ $ret != 0 ]; then
-		echo_i "failed"
-	fi
-	status=`expr $status + $ret`
-	n=$((n+1))
+status=$(expr $status + $ret)
+n=$((n + 1))
+
+for owner in . foo.example.; do
+  echo_i "creating new key using owner name \"$owner\" ($n)"
+  ret=0
+  keyname=$($KEYCREATE $dhkeyname $owner) || ret=1
+  if [ $ret != 0 ]; then
+    echo_i "failed"
+    status=$((status + ret))
+    echo_i "exit status: $status"
+    exit $status
+  fi
+  status=$(expr $status + $ret)
+  n=$((n + 1))
+
+  echo_i "checking the new key ($n)"
+  ret=0
+  $DIG $DIGOPTS txt txt.example -k $keyname >dig.out.1 || ret=1
+  grep "status: NOERROR" dig.out.1 >/dev/null || ret=1
+  grep "TSIG.*hmac-md5.*NOERROR" dig.out.1 >/dev/null || ret=1
+  grep "Some TSIG could not be validated" dig.out.1 >/dev/null && ret=1
+  if [ $ret != 0 ]; then
+    echo_i "failed"
+  fi
+  status=$(expr $status + $ret)
+  n=$((n + 1))
+
+  echo_i "deleting new key ($n)"
+  ret=0
+  $KEYDELETE $keyname || ret=1
+  if [ $ret != 0 ]; then
+    echo_i "failed"
+  fi
+  status=$(expr $status + $ret)
+  n=$((n + 1))
+
+  echo_i "checking that new key has been deleted ($n)"
+  ret=0
+  $DIG $DIGOPTS txt txt.example -k $keyname >dig.out.2 || ret=1
+  grep "status: NOERROR" dig.out.2 >/dev/null && ret=1
+  grep "TSIG.*hmac-md5.*NOERROR" dig.out.2 >/dev/null && ret=1
+  grep "Some TSIG could not be validated" dig.out.2 >/dev/null || ret=1
+  if [ $ret != 0 ]; then
+    echo_i "failed"
+  fi
+  status=$(expr $status + $ret)
+  n=$((n + 1))
 done
 
 echo_i "creating new key using owner name bar.example. ($n)"
 ret=0
-keyname=`$KEYCREATE $dhkeyname bar.example.` || ret=1
+keyname=$($KEYCREATE $dhkeyname bar.example.) || ret=1
 if [ $ret != 0 ]; then
-        echo_i "failed"
-	status=$((status+ret))
-        echo_i "exit status: $status"
-        exit $status
+  echo_i "failed"
+  status=$((status + ret))
+  echo_i "exit status: $status"
+  exit $status
 fi
-status=`expr $status + $ret`
-n=$((n+1))
+status=$(expr $status + $ret)
+n=$((n + 1))
 
 echo_i "checking the key with 'rndc tsig-list' ($n)"
 ret=0
-$RNDC -c ../common/rndc.conf -s 10.53.0.1 -p 9953 tsig-list > rndc.out.1
-grep "key \"bar.example.server" rndc.out.1 > /dev/null || ret=1
+$RNDC -c ../common/rndc.conf -s 10.53.0.1 -p 9953 tsig-list >rndc.out.1
+grep "key \"bar.example.server" rndc.out.1 >/dev/null || ret=1
 if [ $ret != 0 ]; then
-        echo_i "failed"
+  echo_i "failed"
 fi
-status=`expr $status + $ret`
-n=$((n+1))
+status=$(expr $status + $ret)
+n=$((n + 1))
 
 echo_i "using key in a request ($n)"
 ret=0
-$DIG $DIGOPTS -k $keyname txt.example txt > dig.out.3 || ret=1
-grep "status: NOERROR" dig.out.3 > /dev/null || ret=1
+$DIG $DIGOPTS -k $keyname txt.example txt >dig.out.3 || ret=1
+grep "status: NOERROR" dig.out.3 >/dev/null || ret=1
 if [ $ret != 0 ]; then
-        echo_i "failed"
+  echo_i "failed"
 fi
-status=`expr $status + $ret`
-n=$((n+1))
+status=$(expr $status + $ret)
+n=$((n + 1))
 
 echo_i "deleting the key with 'rndc tsig-delete' ($n)"
 ret=0
-$RNDC -c ../common/rndc.conf -s 10.53.0.1 -p 9953 tsig-delete bar.example.server > /dev/null || ret=1
-$RNDC -c ../common/rndc.conf -s 10.53.0.1 -p 9953 tsig-list > rndc.out.2
-grep "key \"bar.example.server" rndc.out.2 > /dev/null && ret=1
-$DIG $DIGOPTS -k $keyname txt.example txt > dig.out.4 || ret=1
-grep "TSIG could not be validated" dig.out.4 > /dev/null || ret=1
+$RNDC -c ../common/rndc.conf -s 10.53.0.1 -p 9953 tsig-delete bar.example.server >/dev/null || ret=1
+$RNDC -c ../common/rndc.conf -s 10.53.0.1 -p 9953 tsig-list >rndc.out.2
+grep "key \"bar.example.server" rndc.out.2 >/dev/null && ret=1
+$DIG $DIGOPTS -k $keyname txt.example txt >dig.out.4 || ret=1
+grep "TSIG could not be validated" dig.out.4 >/dev/null || ret=1
 if [ $ret != 0 ]; then
-        echo_i "failed"
+  echo_i "failed"
 fi
-status=`expr $status + $ret`
-n=$((n+1))
+status=$(expr $status + $ret)
+n=$((n + 1))
 
 echo_i "recreating the bar.example. key ($n)"
 ret=0
-keyname=`$KEYCREATE $dhkeyname bar.example.` || ret=1
+keyname=$($KEYCREATE $dhkeyname bar.example.) || ret=1
 if [ $ret != 0 ]; then
-        echo_i "failed"
-	status=$((status+ret))
-        echo_i "exit status: $status"
-        exit $status
+  echo_i "failed"
+  status=$((status + ret))
+  echo_i "exit status: $status"
+  exit $status
 fi
-status=`expr $status + $ret`
-n=$((n+1))
+status=$(expr $status + $ret)
+n=$((n + 1))
 
 echo_i "checking the new key with 'rndc tsig-list' ($n)"
 ret=0
-$RNDC -c ../common/rndc.conf -s 10.53.0.1 -p 9953 tsig-list > rndc.out.3
-grep "key \"bar.example.server" rndc.out.3 > /dev/null || ret=1
+$RNDC -c ../common/rndc.conf -s 10.53.0.1 -p 9953 tsig-list >rndc.out.3
+grep "key \"bar.example.server" rndc.out.3 >/dev/null || ret=1
 if [ $ret != 0 ]; then
-        echo_i "failed"
+  echo_i "failed"
 fi
-status=`expr $status + $ret`
-n=$((n+1))
+status=$(expr $status + $ret)
+n=$((n + 1))
 
 echo_i "using the new key in a request ($n)"
 ret=0
-$DIG $DIGOPTS -k $keyname txt.example txt > dig.out.5 || ret=1
-grep "status: NOERROR" dig.out.5 > /dev/null || ret=1
+$DIG $DIGOPTS -k $keyname txt.example txt >dig.out.5 || ret=1
+grep "status: NOERROR" dig.out.5 >/dev/null || ret=1
 if [ $ret != 0 ]; then
-        echo_i "failed"
+  echo_i "failed"
 fi
-status=`expr $status + $ret`
-n=$((n+1))
+status=$(expr $status + $ret)
+n=$((n + 1))
 
 echo_i "exit status: $status"
 [ $status -eq 0 ] || exit 1