Merging upstream version 1:9.16.48.

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

4 files changed, 100 insertions, 108 deletions

diff --git a/bin/tests/system/nsec3/clean.sh b/bin/tests/system/nsec3/clean.sh
index b8e8317..7810e53 100644
--- a/bin/tests/system/nsec3/clean.sh
+++ b/bin/tests/system/nsec3/clean.sh
@@ -18,4 +18,3 @@ rm -f ns*/named.conf ns*/named.memstats ns*/named.run*
 rm -f ns*/*.jnl ns*/*.jbk ns*/managed-keys.bind
 rm -f ns*/K*.private ns*/K*.key ns*/K*.state
 rm -f ns*/dsset-* ns*/*.db ns*/*.db.signed
-
diff --git a/bin/tests/system/nsec3/ns3/setup.sh b/bin/tests/system/nsec3/ns3/setup.sh
index b7c449a..5c2fe8b 100644
--- a/bin/tests/system/nsec3/ns3/setup.sh
+++ b/bin/tests/system/nsec3/ns3/setup.sh
@@ -17,19 +17,18 @@
 echo_i "ns3/setup.sh"
 
 setup() {
-	zone="$1"
-	echo_i "setting up zone: $zone"
-	zonefile="${zone}.db"
-	infile="${zone}.db.infile"
-	cp template.db.in "$zonefile"
+  zone="$1"
+  echo_i "setting up zone: $zone"
+  zonefile="${zone}.db"
+  infile="${zone}.db.infile"
+  cp template.db.in "$zonefile"
 }
 
 for zn in nsec-to-nsec3 nsec3 nsec3-other nsec3-change nsec3-to-nsec \
-	  nsec3-to-optout nsec3-from-optout nsec3-dynamic \
-	  nsec3-dynamic-change nsec3-dynamic-to-inline \
-	  nsec3-inline-to-dynamic nsec3-dynamic-update-inline
-do
-	setup "${zn}.kasp"
+  nsec3-to-optout nsec3-from-optout nsec3-dynamic \
+  nsec3-dynamic-change nsec3-dynamic-to-inline \
+  nsec3-inline-to-dynamic nsec3-dynamic-update-inline; do
+  setup "${zn}.kasp"
 done
 
 cp nsec3-fails-to-load.kasp.db.in nsec3-fails-to-load.kasp.db
diff --git a/bin/tests/system/nsec3/setup.sh b/bin/tests/system/nsec3/setup.sh
index bdd1ae9..3019361 100644
--- a/bin/tests/system/nsec3/setup.sh
+++ b/bin/tests/system/nsec3/setup.sh
@@ -20,11 +20,11 @@ $SHELL clean.sh
 
 copy_setports ns2/named.conf.in ns2/named.conf
 (
-	cd ns2
-	$SHELL setup.sh
+  cd ns2
+  $SHELL setup.sh
 )
 copy_setports ns3/named.conf.in ns3/named.conf
 (
-	cd ns3
-	$SHELL setup.sh
+  cd ns3
+  $SHELL setup.sh
 )
diff --git a/bin/tests/system/nsec3/tests.sh b/bin/tests/system/nsec3/tests.sh
index 0141103..915e082 100644
--- a/bin/tests/system/nsec3/tests.sh
+++ b/bin/tests/system/nsec3/tests.sh
@@ -18,134 +18,128 @@
 
 # Log errors and increment $ret.
 log_error() {
-	echo_i "error: $1"
-	ret=$((ret+1))
+  echo_i "error: $1"
+  ret=$((ret + 1))
 }
 
 # Call dig with default options.
 dig_with_opts() {
-	$DIG +tcp +noadd +nosea +nostat +nocmd +dnssec -p "$PORT" "$@"
+  $DIG +tcp +noadd +nosea +nostat +nocmd +dnssec -p "$PORT" "$@"
 }
 
 # Call rndc.
 rndccmd() {
-    "$RNDC" -c ../common/rndc.conf -p "$CONTROLPORT" -s "$@"
+  "$RNDC" -c ../common/rndc.conf -p "$CONTROLPORT" -s "$@"
 }
 
 # Set zone name ($1) and policy ($2) for testing nsec3.
 set_zone_policy() {
-	ZONE=$1
-	POLICY=$2
+  ZONE=$1
+  POLICY=$2
 }
 # Set expected NSEC3 parameters: flags ($1), iterations ($2), and
 # salt length ($3).
 set_nsec3param() {
-	FLAGS=$1
-	ITERATIONS=$2
-	SALTLEN=$3
-	# Reset salt.
-	SALT=""
+  FLAGS=$1
+  ITERATIONS=$2
+  SALTLEN=$3
+  # Reset salt.
+  SALT=""
 }
 
 # The apex NSEC3PARAM record indicates that it is signed.
 _wait_for_nsec3param() {
-	dig_with_opts +noquestion "@${SERVER}" "$ZONE" NSEC3PARAM > "dig.out.test$n.wait" || return 1
-	grep "${ZONE}\..*IN.*NSEC3PARAM.*1.*0.*${ITERATIONS}.*${SALT}" "dig.out.test$n.wait" > /dev/null || return 1
-	grep "${ZONE}\..*IN.*RRSIG" "dig.out.test$n.wait" > /dev/null || return 1
-        return 0
+  dig_with_opts +noquestion "@${SERVER}" "$ZONE" NSEC3PARAM >"dig.out.test$n.wait" || return 1
+  grep "${ZONE}\..*IN.*NSEC3PARAM.*1.*0.*${ITERATIONS}.*${SALT}" "dig.out.test$n.wait" >/dev/null || return 1
+  grep "${ZONE}\..*IN.*RRSIG" "dig.out.test$n.wait" >/dev/null || return 1
+  return 0
 }
 # The apex NSEC record indicates that it is signed.
 _wait_for_nsec() {
-	dig_with_opts +noquestion "@${SERVER}" "$ZONE" NSEC > "dig.out.test$n.wait" || return 1
-	grep "NS SOA" "dig.out.test$n.wait" > /dev/null || return 1
-	grep "${ZONE}\..*IN.*RRSIG" "dig.out.test$n.wait" > /dev/null || return 1
-	grep "${ZONE}\..*IN.*NSEC3PARAM" "dig.out.test$n.wait" > /dev/null && return 1
-        return 0
+  dig_with_opts +noquestion "@${SERVER}" "$ZONE" NSEC >"dig.out.test$n.wait" || return 1
+  grep "NS SOA" "dig.out.test$n.wait" >/dev/null || return 1
+  grep "${ZONE}\..*IN.*RRSIG" "dig.out.test$n.wait" >/dev/null || return 1
+  grep "${ZONE}\..*IN.*NSEC3PARAM" "dig.out.test$n.wait" >/dev/null && return 1
+  return 0
 }
 
 # Wait for the zone to be signed.
 wait_for_zone_is_signed() {
-	n=$((n+1))
-	ret=0
-	echo_i "wait for ${ZONE} to be signed ($n)"
-
-	if [ "$1" = "nsec3" ]; then
-		retry_quiet 10 _wait_for_nsec3param || log_error "wait for ${ZONE} to be signed failed"
-	else
-		retry_quiet 10 _wait_for_nsec || log_error "wait for ${ZONE} to be signed failed"
-	fi
-
-	test "$ret" -eq 0 || echo_i "failed"
-	status=$((status+ret))
+  n=$((n + 1))
+  ret=0
+  echo_i "wait for ${ZONE} to be signed ($n)"
+
+  if [ "$1" = "nsec3" ]; then
+    retry_quiet 10 _wait_for_nsec3param || log_error "wait for ${ZONE} to be signed failed"
+  else
+    retry_quiet 10 _wait_for_nsec || log_error "wait for ${ZONE} to be signed failed"
+  fi
+
+  test "$ret" -eq 0 || echo_i "failed"
+  status=$((status + ret))
 }
 
 # Test: check NSEC in answers
-_check_nsec_nsec3param()
-{
-	dig_with_opts +noquestion @$SERVER "${ZONE}" NSEC3PARAM > "dig.out.test$n.nsec3param.$ZONE" || return 1
-	grep "NSEC3PARAM" "dig.out.test$n.nsec3param.$ZONE" > /dev/null && return 1
-	return 0
+_check_nsec_nsec3param() {
+  dig_with_opts +noquestion @$SERVER "${ZONE}" NSEC3PARAM >"dig.out.test$n.nsec3param.$ZONE" || return 1
+  grep "NSEC3PARAM" "dig.out.test$n.nsec3param.$ZONE" >/dev/null && return 1
+  return 0
 }
 
-_check_nsec_nxdomain()
-{
-	dig_with_opts @$SERVER "nosuchname.${ZONE}" > "dig.out.test$n.nxdomain.$ZONE" || return 1
-	grep "${ZONE}.*IN.*NSEC.*NS.*SOA.*RRSIG.*NSEC.*DNSKEY" "dig.out.test$n.nxdomain.$ZONE" > /dev/null || return 1
-	grep "NSEC3" "dig.out.test$n.nxdomain.$ZONE" > /dev/null && return 1
-	return 0
+_check_nsec_nxdomain() {
+  dig_with_opts @$SERVER "nosuchname.${ZONE}" >"dig.out.test$n.nxdomain.$ZONE" || return 1
+  grep "${ZONE}.*IN.*NSEC.*NS.*SOA.*RRSIG.*NSEC.*DNSKEY" "dig.out.test$n.nxdomain.$ZONE" >/dev/null || return 1
+  grep "NSEC3" "dig.out.test$n.nxdomain.$ZONE" >/dev/null && return 1
+  return 0
 }
 
-check_nsec()
-{
-	n=$((n+1))
-	echo_i "check NSEC3PARAM response for zone ${ZONE} ($n)"
-	ret=0
-	retry_quiet 10 _check_nsec_nsec3param || log_error "unexpected NSEC3PARAM in response for zone ${ZONE}"
-	test "$ret" -eq 0 || echo_i "failed"
-	status=$((status+ret))
-
-	n=$((n+1))
-	echo_i "check NXDOMAIN response for zone ${ZONE} ($n)"
-	ret=0
-	retry_quiet 10 _check_nsec_nxdomain || log_error "bad NXDOMAIN response for zone ${ZONE}"
-	test "$ret" -eq 0 || echo_i "failed"
-	status=$((status+ret))
+check_nsec() {
+  n=$((n + 1))
+  echo_i "check NSEC3PARAM response for zone ${ZONE} ($n)"
+  ret=0
+  retry_quiet 10 _check_nsec_nsec3param || log_error "unexpected NSEC3PARAM in response for zone ${ZONE}"
+  test "$ret" -eq 0 || echo_i "failed"
+  status=$((status + ret))
+
+  n=$((n + 1))
+  echo_i "check NXDOMAIN response for zone ${ZONE} ($n)"
+  ret=0
+  retry_quiet 10 _check_nsec_nxdomain || log_error "bad NXDOMAIN response for zone ${ZONE}"
+  test "$ret" -eq 0 || echo_i "failed"
+  status=$((status + ret))
 }
 
 # Test: check NSEC3 parameters in answers
-_check_nsec3_nsec3param()
-{
-	dig_with_opts +noquestion @$SERVER "${ZONE}" NSEC3PARAM > "dig.out.test$n.nsec3param.$ZONE" || return 1
-	grep "${ZONE}.*0.*IN.*NSEC3PARAM.*1.*0.*${ITERATIONS}.*${SALT}" "dig.out.test$n.nsec3param.$ZONE" > /dev/null || return 1
-
-	if [ -z "$SALT" ]; then
-		SALT=`awk '$4 == "NSEC3PARAM" { print $8 }' dig.out.test$n.nsec3param.$ZONE`
-	fi
-	return 0
+_check_nsec3_nsec3param() {
+  dig_with_opts +noquestion @$SERVER "${ZONE}" NSEC3PARAM >"dig.out.test$n.nsec3param.$ZONE" || return 1
+  grep "${ZONE}.*0.*IN.*NSEC3PARAM.*1.*0.*${ITERATIONS}.*${SALT}" "dig.out.test$n.nsec3param.$ZONE" >/dev/null || return 1
+
+  if [ -z "$SALT" ]; then
+    SALT=$(awk '$4 == "NSEC3PARAM" { print $8 }' dig.out.test$n.nsec3param.$ZONE)
+  fi
+  return 0
 }
 
-_check_nsec3_nxdomain()
-{
-	dig_with_opts @$SERVER "nosuchname.${ZONE}" > "dig.out.test$n.nxdomain.$ZONE" || return 1
-	grep ".*\.${ZONE}.*IN.*NSEC3.*1.${FLAGS}.*${ITERATIONS}.*${SALT}" "dig.out.test$n.nxdomain.$ZONE" > /dev/null || return 1
-	return 0
+_check_nsec3_nxdomain() {
+  dig_with_opts @$SERVER "nosuchname.${ZONE}" >"dig.out.test$n.nxdomain.$ZONE" || return 1
+  grep ".*\.${ZONE}.*IN.*NSEC3.*1.${FLAGS}.*${ITERATIONS}.*${SALT}" "dig.out.test$n.nxdomain.$ZONE" >/dev/null || return 1
+  return 0
 }
 
-check_nsec3()
-{
-	n=$((n+1))
-	echo_i "check that NSEC3PARAM 1 0 ${ITERATIONS} is published zone ${ZONE} ($n)"
-	ret=0
-	retry_quiet 10 _check_nsec3_nsec3param || log_error "bad NSEC3PARAM response for ${ZONE}"
-	test "$ret" -eq 0 || echo_i "failed"
-	status=$((status+ret))
-
-	n=$((n+1))
-	echo_i "check NXDOMAIN response has correct NSEC3 1 ${FLAGS} ${ITERATIONS} ${SALT} for zone ${ZONE} ($n)"
-	ret=0
-	retry_quiet 10 _check_nsec3_nxdomain || log_error "bad NXDOMAIN response for zone ${ZONE}"
-	test "$ret" -eq 0 || echo_i "failed"
-	status=$((status+ret))
+check_nsec3() {
+  n=$((n + 1))
+  echo_i "check that NSEC3PARAM 1 0 ${ITERATIONS} is published zone ${ZONE} ($n)"
+  ret=0
+  retry_quiet 10 _check_nsec3_nsec3param || log_error "bad NSEC3PARAM response for ${ZONE}"
+  test "$ret" -eq 0 || echo_i "failed"
+  status=$((status + ret))
+
+  n=$((n + 1))
+  echo_i "check NXDOMAIN response has correct NSEC3 1 ${FLAGS} ${ITERATIONS} ${SALT} for zone ${ZONE} ($n)"
+  ret=0
+  retry_quiet 10 _check_nsec3_nxdomain || log_error "bad NXDOMAIN response for zone ${ZONE}"
+  test "$ret" -eq 0 || echo_i "failed"
+  status=$((status + ret))
 }
 
 start_time="$(TZ=UTC date +%s)"
@@ -239,10 +233,10 @@ set_zone_policy "nsec3-dynamic-update-inline.kasp" "nsec" 1 3600
 echo_i "initial check zone ${ZONE}"
 check_nsec
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "dynamic update dnssec-policy zone ${ZONE} with NSEC3 ($n)"
 ret=0
-$NSUPDATE > update.out.$ZONE.test$n 2>&1 << END || ret=1
+$NSUPDATE >update.out.$ZONE.test$n 2>&1 <<END || ret=1
 server 10.53.0.3 ${PORT}
 zone ${ZONE}.
 update add 04O18462RI5903H8RDVL0QDT5B528DUJ.${ZONE}. 3600 NSEC3 0 0 0 408A4B2D412A4E95 1JMDDPMTFF8QQLIOINSIG4CR9OTICAOC A RRSIG
@@ -341,8 +335,8 @@ dnssec_verify
 # Using rndc signing -nsec3param (should fail)
 set_zone_policy "nsec3-change.kasp" "nsec3-other"
 echo_i "use rndc signing -nsec3param ${ZONE} to change NSEC3 settings"
-rndccmd $SERVER signing -nsec3param 1 1 12 ffff $ZONE > rndc.signing.test$n.$ZONE || log_error "failed to call rndc signing -nsec3param $ZONE"
-grep "zone uses dnssec-policy, use rndc dnssec command instead" rndc.signing.test$n.$ZONE > /dev/null || log_error "rndc signing -nsec3param should fail"
+rndccmd $SERVER signing -nsec3param 1 1 12 ffff $ZONE >rndc.signing.test$n.$ZONE || log_error "failed to call rndc signing -nsec3param $ZONE"
+grep "zone uses dnssec-policy, use rndc dnssec command instead" rndc.signing.test$n.$ZONE >/dev/null || log_error "rndc signing -nsec3param should fail"
 check_nsec3
 dnssec_verify
 
@@ -358,13 +352,13 @@ ret=0
 echo "stop ns3"
 stop_server --use-rndc --port ${CONTROLPORT} ${DIR} || ret=1
 test "$ret" -eq 0 || echo_i "failed"
-status=$((status+ret))
+status=$((status + ret))
 
 ret=0
 echo "start ns3"
 start_server --noclean --restart --port ${PORT} ${DIR}
 test "$ret" -eq 0 || echo_i "failed"
-status=$((status+ret))
+status=$((status + ret))
 
 prevsalt="${SALT}"
 set_zone_policy "nsec3.kasp" "nsec3"