Merging upstream version 1:9.18.24.

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

7 files changed, 63 insertions, 55 deletions

diff --git a/bin/tests/system/views/ns2/named1.conf.in b/bin/tests/system/views/ns2/named1.conf.in
index 4a257c0..d79a35e 100644
--- a/bin/tests/system/views/ns2/named1.conf.in
+++ b/bin/tests/system/views/ns2/named1.conf.in
@@ -36,7 +36,7 @@ controls {
 
 zone "." {
 	type hint;
-	file "../../common/root.hint";
+	file "../../_common/root.hint";
 };
 
 zone "example" {
diff --git a/bin/tests/system/views/ns2/named2.conf.in b/bin/tests/system/views/ns2/named2.conf.in
index 8a4d773..8819f50 100644
--- a/bin/tests/system/views/ns2/named2.conf.in
+++ b/bin/tests/system/views/ns2/named2.conf.in
@@ -39,7 +39,7 @@ view "internal" {
 
 	zone "." {
 		type hint;
-		file "../../common/root.hint";
+		file "../../_common/root.hint";
 	};
 
 	zone "example" {
@@ -74,7 +74,7 @@ view "external" {
 
 	zone "." {
 		type hint;
-		file "../../common/root.hint";
+		file "../../_common/root.hint";
 	};
 
 	zone "example" {
diff --git a/bin/tests/system/views/ns3/named1.conf.in b/bin/tests/system/views/ns3/named1.conf.in
index b4fbf41..a4cb243 100644
--- a/bin/tests/system/views/ns3/named1.conf.in
+++ b/bin/tests/system/views/ns3/named1.conf.in
@@ -36,7 +36,7 @@ controls {
 
 zone "." {
 	type hint;
-	file "../../common/root.hint";
+	file "../../_common/root.hint";
 };
 
 zone "example" {
diff --git a/bin/tests/system/views/ns3/named2.conf.in b/bin/tests/system/views/ns3/named2.conf.in
index 0ef2009..0f819fa 100644
--- a/bin/tests/system/views/ns3/named2.conf.in
+++ b/bin/tests/system/views/ns3/named2.conf.in
@@ -36,7 +36,7 @@ controls {
 
 zone "." {
 	type hint;
-	file "../../common/root.hint";
+	file "../../_common/root.hint";
 };
 
 zone "example" {
diff --git a/bin/tests/system/views/ns5/named.conf.in b/bin/tests/system/views/ns5/named.conf.in
index 4c4ee4e..23556a7 100644
--- a/bin/tests/system/views/ns5/named.conf.in
+++ b/bin/tests/system/views/ns5/named.conf.in
@@ -36,7 +36,7 @@ controls {
 
 zone "." {
 	type hint;
-	file "../../common/root.hint";
+	file "../../_common/root.hint";
 };
 
 zone "child.clone" {
diff --git a/bin/tests/system/views/setup.sh b/bin/tests/system/views/setup.sh
index e0cca83..9ccf5d0 100644
--- a/bin/tests/system/views/setup.sh
+++ b/bin/tests/system/views/setup.sh
@@ -28,11 +28,11 @@ copy_setports ns5/named.conf.in ns5/named.conf
 # same source of "random" data and we want different keys for
 # internal and external instances of inline.
 #
-$KEYGEN -K ns2/internal -a ${DEFAULT_ALGORITHM} -q inline > /dev/null 2>&1
-$KEYGEN -K ns2/internal -a ${DEFAULT_ALGORITHM} -qfk inline > /dev/null 2>&1
-k1=$($KEYGEN -K ns2/external -a ${DEFAULT_ALGORITHM} -q inline 2> /dev/null)
-k2=$($KEYGEN -K ns2/external -a ${DEFAULT_ALGORITHM} -qfk inline 2> /dev/null)
-$KEYGEN -K ns2/external -a ${DEFAULT_ALGORITHM} -q inline > /dev/null 2>&1
-$KEYGEN -K ns2/external -a ${DEFAULT_ALGORITHM} -qfk inline > /dev/null 2>&1
+$KEYGEN -K ns2/internal -a ${DEFAULT_ALGORITHM} -q inline >/dev/null 2>&1
+$KEYGEN -K ns2/internal -a ${DEFAULT_ALGORITHM} -qfk inline >/dev/null 2>&1
+k1=$($KEYGEN -K ns2/external -a ${DEFAULT_ALGORITHM} -q inline 2>/dev/null)
+k2=$($KEYGEN -K ns2/external -a ${DEFAULT_ALGORITHM} -qfk inline 2>/dev/null)
+$KEYGEN -K ns2/external -a ${DEFAULT_ALGORITHM} -q inline >/dev/null 2>&1
+$KEYGEN -K ns2/external -a ${DEFAULT_ALGORITHM} -qfk inline >/dev/null 2>&1
 test -n "$k1" && rm -f ns2/external/"$k1".*
 test -n "$k2" && rm -f ns2/external/"$k2".*
diff --git a/bin/tests/system/views/tests.sh b/bin/tests/system/views/tests.sh
index 06cb3b1..27c3285 100644
--- a/bin/tests/system/views/tests.sh
+++ b/bin/tests/system/views/tests.sh
@@ -17,22 +17,22 @@ set -e
 . ../conf.sh
 
 dig_with_opts() {
-	"$DIG" +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd +noauth -p "${PORT}" "$@"
+  "$DIG" +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd +noauth -p "${PORT}" "$@"
 }
 
 dig_with_shortopts() {
-	"$DIG" +tcp +short -p "${PORT}" "$@"
+  "$DIG" +tcp +short -p "${PORT}" "$@"
 }
 
-RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
+RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
 
 status=0
 
 echo_i "fetching a.example from ns2's initial configuration"
-dig_with_opts a.example. @10.53.0.2 any > dig.out.ns2.1 || status=1
+dig_with_opts a.example. @10.53.0.2 any >dig.out.ns2.1 || status=1
 
 echo_i "fetching a.example from ns3's initial configuration"
-dig_with_opts a.example. @10.53.0.3 any > dig.out.ns3.1 || status=1
+dig_with_opts a.example. @10.53.0.3 any >dig.out.ns3.1 || status=1
 
 echo_i "copying in new configurations for ns2 and ns3"
 rm -f ns2/named.conf ns3/named.conf ns2/example.db
@@ -41,30 +41,30 @@ copy_setports ns2/named2.conf.in ns2/named.conf
 copy_setports ns3/named2.conf.in ns3/named.conf
 
 echo_i "reloading ns2 and ns3 with rndc"
-nextpart ns2/named.run > /dev/null
-nextpart ns3/named.run > /dev/null
+nextpart ns2/named.run >/dev/null
+nextpart ns3/named.run >/dev/null
 rndc_reload ns2 10.53.0.2
 rndc_reload ns3 10.53.0.3
 
 echo_i "wait for reload to complete"
 ret=0
 _check_reload() (
-  nextpartpeek ns2/named.run | grep "all zones loaded" > /dev/null && \
-  nextpartpeek ns3/named.run | grep "all zones loaded" > /dev/null && \
-  nextpartpeek ns3/named.run | grep "zone_dump: zone example/IN: enter" > /dev/null
+  nextpartpeek ns2/named.run | grep "all zones loaded" >/dev/null \
+    && nextpartpeek ns3/named.run | grep "all zones loaded" >/dev/null \
+    && nextpartpeek ns3/named.run | grep "zone_dump: zone example/IN: enter" >/dev/null
 )
 retry_quiet 10 _check_reload || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
 echo_i "fetching a.example from ns2's 10.53.0.4, source address 10.53.0.4"
-dig_with_opts -b 10.53.0.4 a.example. @10.53.0.4 any > dig.out.ns4.2 || status=1
+dig_with_opts -b 10.53.0.4 a.example. @10.53.0.4 any >dig.out.ns4.2 || status=1
 
 echo_i "fetching a.example from ns2's 10.53.0.2, source address 10.53.0.2"
-dig_with_opts -b 10.53.0.2 a.example. @10.53.0.2 any > dig.out.ns2.2 || status=1
+dig_with_opts -b 10.53.0.2 a.example. @10.53.0.2 any >dig.out.ns2.2 || status=1
 
 echo_i "fetching a.example from ns3's 10.53.0.3, source address defaulted"
-dig_with_opts @10.53.0.3 a.example. any > dig.out.ns3.2 || status=1
+dig_with_opts @10.53.0.3 a.example. any >dig.out.ns3.2 || status=1
 
 echo_i "comparing ns3's initial a.example to one from reconfigured 10.53.0.2"
 digcomp dig.out.ns3.1 dig.out.ns2.2 || status=1
@@ -77,14 +77,13 @@ digcomp dig.out.ns2.1 dig.out.ns4.2 || status=1
 
 echo_i "comparing ns2's initial a.example to one from reconfigured 10.53.0.3"
 echo_i "(should be different)"
-if $PERL ../digcomp.pl dig.out.ns2.1 dig.out.ns3.2 >/dev/null
-then
-	echo_i "no differences found.  something's wrong."
-	status=1
+if $PERL ../digcomp.pl dig.out.ns2.1 dig.out.ns3.2 >/dev/null; then
+  echo_i "no differences found.  something's wrong."
+  status=1
 fi
 
 echo_i "updating cloned zone in internal view"
-$NSUPDATE << EOF
+$NSUPDATE <<EOF
 server 10.53.0.2 ${PORT}
 zone clone
 update add b.clone. 300 in a 10.1.0.3
@@ -98,8 +97,8 @@ ret=0
 one=$(dig_with_shortopts -b 10.53.0.2 @10.53.0.2 b.clone a)
 two=$(dig_with_shortopts -b 10.53.0.4 @10.53.0.2 b.clone a)
 if [ "$one" != "$two" ]; then
-        echo_i "'$one' does not match '$two'"
-        ret=1
+  echo_i "'$one' does not match '$two'"
+  ret=1
 fi
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
@@ -110,19 +109,25 @@ one=$(dig_with_shortopts -b 10.53.0.2 @10.53.0.2 child.clone txt)
 two=$(dig_with_shortopts -b 10.53.0.4 @10.53.0.2 child.clone txt)
 three=$(dig_with_shortopts @10.53.0.3 child.clone txt)
 four=$(dig_with_shortopts @10.53.0.5 child.clone txt)
-echo "$three" | grep NS3 > /dev/null || { ret=1; echo_i "expected response from NS3 got '$three'"; }
-echo "$four" | grep NS5 > /dev/null || { ret=1; echo_i "expected response from NS5 got '$four'"; }
+echo "$three" | grep NS3 >/dev/null || {
+  ret=1
+  echo_i "expected response from NS3 got '$three'"
+}
+echo "$four" | grep NS5 >/dev/null || {
+  ret=1
+  echo_i "expected response from NS5 got '$four'"
+}
 if [ "$one" = "$two" ]; then
-        echo_i "'$one' matches '$two'"
-        ret=1
+  echo_i "'$one' matches '$two'"
+  ret=1
 fi
 if [ "$one" != "$three" ]; then
-        echo_i "'$one' does not match '$three'"
-        ret=1
+  echo_i "'$one' does not match '$three'"
+  ret=1
 fi
 if [ "$two" != "$four" ]; then
-        echo_i "'$two' does not match '$four'"
-        ret=1
+  echo_i "'$two' does not match '$four'"
+  ret=1
 fi
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
@@ -130,11 +135,11 @@ status=$((status + ret))
 echo_i "verifying inline zones work with views"
 ret=0
 wait_for_signed() {
-    "$DIG" -p "${PORT}" @10.53.0.2 -b 10.53.0.2 +dnssec DNSKEY inline > dig.out.internal
-    "$DIG" -p "${PORT}" @10.53.0.2 -b 10.53.0.5 +dnssec DNSKEY inline > dig.out.external
-    grep "ANSWER: 4," dig.out.internal > /dev/null || return 1
-    grep "ANSWER: 4," dig.out.external > /dev/null || return 1
-    return 0
+  "$DIG" -p "${PORT}" @10.53.0.2 -b 10.53.0.2 +dnssec DNSKEY inline >dig.out.internal
+  "$DIG" -p "${PORT}" @10.53.0.2 -b 10.53.0.5 +dnssec DNSKEY inline >dig.out.external
+  grep "ANSWER: 4," dig.out.internal >/dev/null || return 1
+  grep "ANSWER: 4," dig.out.external >/dev/null || return 1
+  return 0
 }
 retry_quiet 10 wait_for_signed || ret=1
 int=$(awk '$4 == "DNSKEY" { print $8 }' dig.out.internal | sort)
@@ -150,11 +155,11 @@ copy_setports ns2/named3.conf.in ns2/named.conf
 
 i=1
 while [ $i -lt 50 ]; do
-	ret=0
-	zone_name=$(printf "example%03d.com" $i)
+  ret=0
+  zone_name=$(printf "example%03d.com" $i)
 
-	# Add a new zone to the configuration.
-	cat >> ns2/zones.conf <<-EOF
+  # Add a new zone to the configuration.
+  cat >>ns2/zones.conf <<-EOF
 	zone "${zone_name}" {
 	    type primary;
 	    file "db.${zone_name}";
@@ -164,8 +169,8 @@ while [ $i -lt 50 ]; do
 	};
 	EOF
 
-	# Create a master file for the zone.
-	cat > "ns2/db.${zone_name}" <<-EOF
+  # Create a master file for the zone.
+  cat >"ns2/db.${zone_name}" <<-EOF
 	\$TTL 86400
 	@		IN	SOA	localhost. hostmaster.localhost (
 						1612542642 ; serial
@@ -178,10 +183,13 @@ while [ $i -lt 50 ]; do
 	localhost       IN      A       127.0.0.1
 	EOF
 
-	$KEYGEN -q -Kns2 -fk -aecdsa256 "${zone_name}" > /dev/null
-	$RNDCCMD 10.53.0.2 reconfig || ret=1
-	if [ $ret != 0 ]; then echo_i "failed"; break; fi
-	i=$((i + 1))
+  $KEYGEN -q -Kns2 -fk -aecdsa256 "${zone_name}" >/dev/null
+  $RNDCCMD 10.53.0.2 reconfig || ret=1
+  if [ $ret != 0 ]; then
+    echo_i "failed"
+    break
+  fi
+  i=$((i + 1))
 done
 status=$((status + ret))