Merging upstream version 1:9.18.24.

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

6 files changed, 33 insertions, 34 deletions

diff --git a/bin/tests/system/pending/ns1/sign.sh b/bin/tests/system/pending/ns1/sign.sh
index cb3662f..c7b99c3 100644
--- a/bin/tests/system/pending/ns1/sign.sh
+++ b/bin/tests/system/pending/ns1/sign.sh
@@ -17,19 +17,19 @@ zone=.
 infile=root.db.in
 zonefile=root.db
 
-(cd ../ns2 && $SHELL -e sign.sh )
+(cd ../ns2 && $SHELL -e sign.sh)
 
 cp ../ns2/dsset-example. .
 cp ../ns2/dsset-example.com. .
 
 keyname1=$($KEYGEN -q -a ${DEFAULT_ALGORITHM} -n zone $zone)
 keyname2=$($KEYGEN -q -a ${DEFAULT_ALGORITHM} -f KSK -n zone $zone)
-cat $infile $keyname1.key $keyname2.key > $zonefile
+cat $infile $keyname1.key $keyname2.key >$zonefile
 
-$SIGNER -g -o $zone $zonefile > /dev/null
+$SIGNER -g -o $zone $zonefile >/dev/null
 
 # Configure the resolving server with a static key.
-keyfile_to_static_ds $keyname2 > trusted.conf
+keyfile_to_static_ds $keyname2 >trusted.conf
 cp trusted.conf ../ns2/trusted.conf
 cp trusted.conf ../ns3/trusted.conf
 cp trusted.conf ../ns4/trusted.conf
diff --git a/bin/tests/system/pending/ns2/named.conf.in b/bin/tests/system/pending/ns2/named.conf.in
index 59824df..a403f13 100644
--- a/bin/tests/system/pending/ns2/named.conf.in
+++ b/bin/tests/system/pending/ns2/named.conf.in
@@ -30,7 +30,7 @@ options {
 
 zone "." {
 	type hint;
-	file "../../common/root.hint";
+	file "../../_common/root.hint";
 };
 
 zone "example" {
diff --git a/bin/tests/system/pending/ns2/sign.sh b/bin/tests/system/pending/ns2/sign.sh
index 4965f85..062e989 100644
--- a/bin/tests/system/pending/ns2/sign.sh
+++ b/bin/tests/system/pending/ns2/sign.sh
@@ -14,20 +14,20 @@
 . ../../conf.sh
 
 for domain in example example.com; do
-	zone=${domain}.
-	infile=${domain}.db.in
-	zonefile=${domain}.db
+  zone=${domain}.
+  infile=${domain}.db.in
+  zonefile=${domain}.db
 
-	keyname1=$($KEYGEN -q -a ${DEFAULT_ALGORITHM} -n zone $zone)
-	keyname2=$($KEYGEN -q -a ${DEFAULT_ALGORITHM} -f KSK -n zone $zone)
+  keyname1=$($KEYGEN -q -a ${DEFAULT_ALGORITHM} -n zone $zone)
+  keyname2=$($KEYGEN -q -a ${DEFAULT_ALGORITHM} -f KSK -n zone $zone)
 
-	cat $infile $keyname1.key $keyname2.key > $zonefile
+  cat $infile $keyname1.key $keyname2.key >$zonefile
 
-	$SIGNER -3 bebe -o $zone $zonefile > /dev/null
+  $SIGNER -3 bebe -o $zone $zonefile >/dev/null
 done
 
 # remove "removed" record from example.com, causing the server to
 # send an apparently-invalid NXDOMAIN
-sed '/^removed/d' example.com.db.signed > example.com.db.new
+sed '/^removed/d' example.com.db.signed >example.com.db.new
 rm -f example.com.db.signed
 mv example.com.db.new example.com.db.signed
diff --git a/bin/tests/system/pending/ns3/named.conf.in b/bin/tests/system/pending/ns3/named.conf.in
index 29afd19..6d69d67 100644
--- a/bin/tests/system/pending/ns3/named.conf.in
+++ b/bin/tests/system/pending/ns3/named.conf.in
@@ -30,7 +30,7 @@ options {
 
 zone "." {
 	type hint;
-	file "../../common/root.hint";
+	file "../../_common/root.hint";
 };
 
 zone "mail.example" {
diff --git a/bin/tests/system/pending/ns4/named.conf.in b/bin/tests/system/pending/ns4/named.conf.in
index dfb5541..0c2e8a8 100644
--- a/bin/tests/system/pending/ns4/named.conf.in
+++ b/bin/tests/system/pending/ns4/named.conf.in
@@ -27,5 +27,5 @@ options {
 
 zone "." {
 	type hint;
-	file "../../common/root.hint";
+	file "../../_common/root.hint";
 };
diff --git a/bin/tests/system/pending/tests.sh b/bin/tests/system/pending/tests.sh
index 362cef3..29ab3e9 100644
--- a/bin/tests/system/pending/tests.sh
+++ b/bin/tests/system/pending/tests.sh
@@ -16,32 +16,31 @@ set -e
 . ../conf.sh
 
 # replace_data dname RR old_data new_data
-replace_data()
-{
-	if [ $# -ne 4 ]; then
-		echo_i "unexpected input for replace_data"
-		return 1
-	fi
-
-	_dname=$1
-	_rr=$2
-	_olddata=$3
-	_newdata=$4
-
-	_ret=0
-	$NSUPDATE -d <<END >> nsupdate.out.test 2>&1 || _ret=1
+replace_data() {
+  if [ $# -ne 4 ]; then
+    echo_i "unexpected input for replace_data"
+    return 1
+  fi
+
+  _dname=$1
+  _rr=$2
+  _olddata=$3
+  _newdata=$4
+
+  _ret=0
+  $NSUPDATE -d <<END >>nsupdate.out.test 2>&1 || _ret=1
 server 10.53.0.2 ${PORT}
 update delete ${_dname} 30 ${_rr} ${_olddata}
 update add ${_dname} 30 ${_rr} ${_newdata}
 send
 END
 
-	if [ $_ret != 0 ]; then
-		echo_i "failed to update the test data"
-		return 1
-	fi
+  if [ $_ret != 0 ]; then
+    echo_i "failed to update the test data"
+    return 1
+  fi
 
-	return 0
+  return 0
 }
 
 status=0