Merging upstream version 1:9.16.48.

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

3 files changed, 150 insertions, 157 deletions

diff --git a/bin/tests/system/synthfromdnssec/ns1/sign.sh b/bin/tests/system/synthfromdnssec/ns1/sign.sh
index 2240767..65d11c6 100644
--- a/bin/tests/system/synthfromdnssec/ns1/sign.sh
+++ b/bin/tests/system/synthfromdnssec/ns1/sign.sh
@@ -19,27 +19,27 @@ infile=example.db.in
 zonefile=example.db
 
 keyname=$($KEYGEN -q -a ${DEFAULT_ALGORITHM} -n zone $zone)
-cat "$infile" "$keyname.key" > "$zonefile"
+cat "$infile" "$keyname.key" >"$zonefile"
 
-$SIGNER -P -o $zone $zonefile > /dev/null
+$SIGNER -P -o $zone $zonefile >/dev/null
 
 zone=dnamed
 infile=dnamed.db.in
 zonefile=dnamed.db
 
 keyname=$($KEYGEN -q -a ${DEFAULT_ALGORITHM} -n zone $zone)
-cat "$infile" "$keyname.key" > "$zonefile"
+cat "$infile" "$keyname.key" >"$zonefile"
 
-$SIGNER -P -o $zone $zonefile > /dev/null
+$SIGNER -P -o $zone $zonefile >/dev/null
 
 zone=.
 infile=root.db.in
 zonefile=root.db
 
 keyname=$($KEYGEN -q -a ${DEFAULT_ALGORITHM} -b ${DEFAULT_BITS} -n zone $zone)
-cat "$infile" "$keyname.key" > "$zonefile"
+cat "$infile" "$keyname.key" >"$zonefile"
 
-$SIGNER -P -g -o $zone $zonefile > /dev/null
+$SIGNER -P -g -o $zone $zonefile >/dev/null
 
 # Configure the resolving server with a static key.
-keyfile_to_static_ds "$keyname" > trusted.conf
+keyfile_to_static_ds "$keyname" >trusted.conf
diff --git a/bin/tests/system/synthfromdnssec/setup.sh b/bin/tests/system/synthfromdnssec/setup.sh
index 6f7bc7c..66cf7c9 100644
--- a/bin/tests/system/synthfromdnssec/setup.sh
+++ b/bin/tests/system/synthfromdnssec/setup.sh
@@ -23,6 +23,6 @@ copy_setports ns4/named.conf.in ns4/named.conf
 copy_setports ns5/named.conf.in ns5/named.conf
 
 (
-    cd ns1
-    $SHELL sign.sh
+  cd ns1
+  $SHELL sign.sh
 )
diff --git a/bin/tests/system/synthfromdnssec/tests.sh b/bin/tests/system/synthfromdnssec/tests.sh
index 95cfc60..b2cd62f 100644
--- a/bin/tests/system/synthfromdnssec/tests.sh
+++ b/bin/tests/system/synthfromdnssec/tests.sh
@@ -23,180 +23,173 @@ n=1
 rm -f dig.out.*
 
 dig_with_opts() {
-    "$DIG" +tcp +noadd +nosea +nostat +nocmd +dnssec -p "$PORT" "$@"
+  "$DIG" +tcp +noadd +nosea +nostat +nocmd +dnssec -p "$PORT" "$@"
 }
 
-for ns in 2 4 5
-do
-    case $ns in
-    2) description="<default>";;
-    4) description="no";;
-    5) description="yes";;
-    *) exit 1;;
-    esac
-    echo_i "prime negative NXDOMAIN response (synth-from-dnssec ${description};) ($n)"
-    ret=0
-    dig_with_opts a.example. @10.53.0.${ns} a > dig.out.ns${ns}.test$n || ret=1
-    grep "flags:[^;]* ad[ ;]" dig.out.ns${ns}.test$n > /dev/null || ret=1
-    grep "status: NXDOMAIN," dig.out.ns${ns}.test$n > /dev/null || ret=1
-    grep "example.*3600.IN.SOA" dig.out.ns${ns}.test$n > /dev/null || ret=1
-    [ $ns -eq ${ns} ] && nxdomain=dig.out.ns${ns}.test$n
-    n=$((n+1))
-    if [ $ret != 0 ]; then echo_i "failed"; fi
-    status=$((status+ret))
-
-    echo_i "prime negative NODATA response (synth-from-dnssec ${description};) ($n)"
-    ret=0
-    dig_with_opts nodata.example. @10.53.0.${ns} a > dig.out.ns${ns}.test$n || ret=1
-    grep "flags:[^;]* ad[ ;]" dig.out.ns${ns}.test$n > /dev/null || ret=1
-    grep "status: NOERROR," dig.out.ns${ns}.test$n > /dev/null || ret=1
-    grep "example.*3600.IN.SOA" dig.out.ns${ns}.test$n > /dev/null || ret=1
-    [ $ns -eq 2 ] && nodata=dig.out.ns${ns}.test$n
-    n=$((n+1))
-    if [ $ret != 0 ]; then echo_i "failed"; fi
-    status=$((status+ret))
-
-    echo_i "prime wildcard response (synth-from-dnssec ${description};) ($n)"
-    ret=0
-    dig_with_opts a.wild-a.example. @10.53.0.${ns} a > dig.out.ns${ns}.test$n || ret=1
-    grep "flags:[^;]* ad[ ;]" dig.out.ns${ns}.test$n > /dev/null || ret=1
-    grep "status: NOERROR," dig.out.ns${ns}.test$n > /dev/null || ret=1
-    grep "a.wild-a.example.*3600.IN.A" dig.out.ns${ns}.test$n > /dev/null || ret=1
-    n=$((n+1))
-    if [ $ret != 0 ]; then echo_i "failed"; fi
-    status=$((status+ret))
-
-    echo_i "prime wildcard CNAME response (synth-from-dnssec ${description};) ($n)"
-    ret=0
-    dig_with_opts a.wild-cname.example. @10.53.0.${ns} a > dig.out.ns${ns}.test$n || ret=1
-    grep "flags:[^;]* ad[ ;]" dig.out.ns${ns}.test$n > /dev/null || ret=1
-    grep "status: NOERROR," dig.out.ns${ns}.test$n > /dev/null || ret=1
-    grep "a.wild-cname.example.*3600.IN.CNAME" dig.out.ns${ns}.test$n > /dev/null || ret=1
-    n=$((n+1))
-    if [ $ret != 0 ]; then echo_i "failed"; fi
-    status=$((status+ret))
+for ns in 2 4 5; do
+  case $ns in
+    2) description="<default>" ;;
+    4) description="no" ;;
+    5) description="yes" ;;
+    *) exit 1 ;;
+  esac
+  echo_i "prime negative NXDOMAIN response (synth-from-dnssec ${description};) ($n)"
+  ret=0
+  dig_with_opts a.example. @10.53.0.${ns} a >dig.out.ns${ns}.test$n || ret=1
+  grep "flags:[^;]* ad[ ;]" dig.out.ns${ns}.test$n >/dev/null || ret=1
+  grep "status: NXDOMAIN," dig.out.ns${ns}.test$n >/dev/null || ret=1
+  grep "example.*3600.IN.SOA" dig.out.ns${ns}.test$n >/dev/null || ret=1
+  [ $ns -eq ${ns} ] && nxdomain=dig.out.ns${ns}.test$n
+  n=$((n + 1))
+  if [ $ret != 0 ]; then echo_i "failed"; fi
+  status=$((status + ret))
+
+  echo_i "prime negative NODATA response (synth-from-dnssec ${description};) ($n)"
+  ret=0
+  dig_with_opts nodata.example. @10.53.0.${ns} a >dig.out.ns${ns}.test$n || ret=1
+  grep "flags:[^;]* ad[ ;]" dig.out.ns${ns}.test$n >/dev/null || ret=1
+  grep "status: NOERROR," dig.out.ns${ns}.test$n >/dev/null || ret=1
+  grep "example.*3600.IN.SOA" dig.out.ns${ns}.test$n >/dev/null || ret=1
+  [ $ns -eq 2 ] && nodata=dig.out.ns${ns}.test$n
+  n=$((n + 1))
+  if [ $ret != 0 ]; then echo_i "failed"; fi
+  status=$((status + ret))
+
+  echo_i "prime wildcard response (synth-from-dnssec ${description};) ($n)"
+  ret=0
+  dig_with_opts a.wild-a.example. @10.53.0.${ns} a >dig.out.ns${ns}.test$n || ret=1
+  grep "flags:[^;]* ad[ ;]" dig.out.ns${ns}.test$n >/dev/null || ret=1
+  grep "status: NOERROR," dig.out.ns${ns}.test$n >/dev/null || ret=1
+  grep "a.wild-a.example.*3600.IN.A" dig.out.ns${ns}.test$n >/dev/null || ret=1
+  n=$((n + 1))
+  if [ $ret != 0 ]; then echo_i "failed"; fi
+  status=$((status + ret))
+
+  echo_i "prime wildcard CNAME response (synth-from-dnssec ${description};) ($n)"
+  ret=0
+  dig_with_opts a.wild-cname.example. @10.53.0.${ns} a >dig.out.ns${ns}.test$n || ret=1
+  grep "flags:[^;]* ad[ ;]" dig.out.ns${ns}.test$n >/dev/null || ret=1
+  grep "status: NOERROR," dig.out.ns${ns}.test$n >/dev/null || ret=1
+  grep "a.wild-cname.example.*3600.IN.CNAME" dig.out.ns${ns}.test$n >/dev/null || ret=1
+  n=$((n + 1))
+  if [ $ret != 0 ]; then echo_i "failed"; fi
+  status=$((status + ret))
 done
 
 echo_i "prime redirect response (+nodnssec) (synth-from-dnssec <default>;) ($n)"
 ret=0
-dig_with_opts +nodnssec a.redirect. @10.53.0.3 a > dig.out.ns2.test$n || ret=1
-grep "flags:[^;]* ad[ ;]" dig.out.ns2.test$n > /dev/null && ret=1
-grep "status: NOERROR," dig.out.ns2.test$n > /dev/null || ret=1
-grep 'a\.redirect\..*300.IN.A.100\.100\.100\.2' dig.out.ns2.test$n > /dev/null || ret=1
-n=$((n+1))
+dig_with_opts +nodnssec a.redirect. @10.53.0.3 a >dig.out.ns2.test$n || ret=1
+grep "flags:[^;]* ad[ ;]" dig.out.ns2.test$n >/dev/null && ret=1
+grep "status: NOERROR," dig.out.ns2.test$n >/dev/null || ret=1
+grep 'a\.redirect\..*300.IN.A.100\.100\.100\.2' dig.out.ns2.test$n >/dev/null || ret=1
+n=$((n + 1))
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=$((status+ret))
+status=$((status + ret))
 
 #
 # ensure TTL of synthesised answers differs from direct answers.
 #
 sleep 1
 
-for ns in 2 4 5
-do
-    case $ns in
-    2) synth=no description="<default>";;
-    4) synth=no  description="no";;
-    5) synth=yes description="yes";;
-    *) exit 1;;
-    esac
-    echo_i "check synthesized NXDOMAIN response (synth-from-dnssec ${description};) ($n)"
-    ret=0
-    dig_with_opts b.example. @10.53.0.${ns} a > dig.out.ns${ns}.test$n || ret=1
-    grep "flags:[^;]* ad[ ;]" dig.out.ns${ns}.test$n > /dev/null || ret=1
-    grep "status: NXDOMAIN," dig.out.ns${ns}.test$n > /dev/null || ret=1
-    if [ ${synth} = yes ]
-    then
-	grep "example.*IN.SOA" dig.out.ns${ns}.test$n > /dev/null || ret=1
-	grep "example.*3600.IN.SOA" dig.out.ns${ns}.test$n > /dev/null && ret=1
-    else
-	grep "example.*3600.IN.SOA" dig.out.ns${ns}.test$n > /dev/null || ret=1
-    fi
-    digcomp $nxdomain dig.out.ns${ns}.test$n || ret=1
-    n=$((n+1))
-    if [ $ret != 0 ]; then echo_i "failed"; fi
-    status=$((status+ret))
-
-    echo_i "check synthesized NODATA response (synth-from-dnssec ${description};) ($n)"
-    ret=0
-    dig_with_opts nodata.example. @10.53.0.${ns} aaaa > dig.out.ns${ns}.test$n || ret=1
-    grep "flags:[^;]* ad[ ;]" dig.out.ns${ns}.test$n > /dev/null || ret=1
-    grep "status: NOERROR," dig.out.ns${ns}.test$n > /dev/null || ret=1
-    if [ ${synth} = yes ]
-    then
-	grep "example.*IN.SOA" dig.out.ns${ns}.test$n > /dev/null || ret=1
-	grep "example.*3600.IN.SOA" dig.out.ns${ns}.test$n > /dev/null && ret=1
-    else
-	grep "example.*3600.IN.SOA" dig.out.ns${ns}.test$n > /dev/null || ret=1
-    fi
-    digcomp $nodata dig.out.ns${ns}.test$n || ret=1
-    n=$((n+1))
-    if [ $ret != 0 ]; then echo_i "failed"; fi
-    status=$((status+ret))
-
-    echo_i "check synthesized wildcard response (synth-from-dnssec ${description};) ($n)"
-    ret=0
-    dig_with_opts b.wild-a.example. @10.53.0.${ns} a > dig.out.ns${ns}.test$n || ret=1
-    grep "flags:[^;]* ad[ ;]" dig.out.ns${ns}.test$n > /dev/null || ret=1
-    grep "status: NOERROR," dig.out.ns${ns}.test$n > /dev/null || ret=1
-    if [ ${synth} = yes ]
-    then
-	    grep "b\.wild-a\.example\..*IN.A" dig.out.ns${ns}.test$n > /dev/null || ret=1
-	    grep "b\.wild-a\.example\..*3600.IN.A" dig.out.ns${ns}.test$n > /dev/null && ret=1
-    else
-	    grep "b\.wild-a\.example\..*3600.IN.A" dig.out.ns${ns}.test$n > /dev/null || ret=1
-    fi
-    n=$((n+1))
-    if [ $ret != 0 ]; then echo_i "failed"; fi
-    status=$((status+ret))
-
-    echo_i "check synthesized wildcard CNAME response (synth-from-dnssec ${description};) ($n)"
-    ret=0
-    dig_with_opts b.wild-cname.example. @10.53.0.${ns} a > dig.out.ns${ns}.test$n || ret=1
-    grep "flags:[^;]* ad[ ;]" dig.out.ns${ns}.test$n > /dev/null || ret=1
-    grep "status: NOERROR," dig.out.ns${ns}.test$n > /dev/null || ret=1
-    if [ ${synth} = yes ]
-    then
-	grep "b.wild-cname.example.*IN.CNAME" dig.out.ns${ns}.test$n > /dev/null || ret=1
-	grep "b.wild-cname.example.*3600.IN.CNAME" dig.out.ns${ns}.test$n > /dev/null && ret=1
-    else
-	grep "b.wild-cname.example.*3600.IN.CNAME" dig.out.ns${ns}.test$n > /dev/null || ret=1
-    fi
-    grep "ns1.example.*.IN.A" dig.out.ns${ns}.test$n > /dev/null || ret=1
-    n=$((n+1))
-    if [ $ret != 0 ]; then echo_i "failed"; fi
-    status=$((status+ret))
+for ns in 2 4 5; do
+  case $ns in
+    2) synth=no description="<default>" ;;
+    4) synth=no description="no" ;;
+    5) synth=yes description="yes" ;;
+    *) exit 1 ;;
+  esac
+  echo_i "check synthesized NXDOMAIN response (synth-from-dnssec ${description};) ($n)"
+  ret=0
+  dig_with_opts b.example. @10.53.0.${ns} a >dig.out.ns${ns}.test$n || ret=1
+  grep "flags:[^;]* ad[ ;]" dig.out.ns${ns}.test$n >/dev/null || ret=1
+  grep "status: NXDOMAIN," dig.out.ns${ns}.test$n >/dev/null || ret=1
+  if [ ${synth} = yes ]; then
+    grep "example.*IN.SOA" dig.out.ns${ns}.test$n >/dev/null || ret=1
+    grep "example.*3600.IN.SOA" dig.out.ns${ns}.test$n >/dev/null && ret=1
+  else
+    grep "example.*3600.IN.SOA" dig.out.ns${ns}.test$n >/dev/null || ret=1
+  fi
+  digcomp $nxdomain dig.out.ns${ns}.test$n || ret=1
+  n=$((n + 1))
+  if [ $ret != 0 ]; then echo_i "failed"; fi
+  status=$((status + ret))
+
+  echo_i "check synthesized NODATA response (synth-from-dnssec ${description};) ($n)"
+  ret=0
+  dig_with_opts nodata.example. @10.53.0.${ns} aaaa >dig.out.ns${ns}.test$n || ret=1
+  grep "flags:[^;]* ad[ ;]" dig.out.ns${ns}.test$n >/dev/null || ret=1
+  grep "status: NOERROR," dig.out.ns${ns}.test$n >/dev/null || ret=1
+  if [ ${synth} = yes ]; then
+    grep "example.*IN.SOA" dig.out.ns${ns}.test$n >/dev/null || ret=1
+    grep "example.*3600.IN.SOA" dig.out.ns${ns}.test$n >/dev/null && ret=1
+  else
+    grep "example.*3600.IN.SOA" dig.out.ns${ns}.test$n >/dev/null || ret=1
+  fi
+  digcomp $nodata dig.out.ns${ns}.test$n || ret=1
+  n=$((n + 1))
+  if [ $ret != 0 ]; then echo_i "failed"; fi
+  status=$((status + ret))
+
+  echo_i "check synthesized wildcard response (synth-from-dnssec ${description};) ($n)"
+  ret=0
+  dig_with_opts b.wild-a.example. @10.53.0.${ns} a >dig.out.ns${ns}.test$n || ret=1
+  grep "flags:[^;]* ad[ ;]" dig.out.ns${ns}.test$n >/dev/null || ret=1
+  grep "status: NOERROR," dig.out.ns${ns}.test$n >/dev/null || ret=1
+  if [ ${synth} = yes ]; then
+    grep "b\.wild-a\.example\..*IN.A" dig.out.ns${ns}.test$n >/dev/null || ret=1
+    grep "b\.wild-a\.example\..*3600.IN.A" dig.out.ns${ns}.test$n >/dev/null && ret=1
+  else
+    grep "b\.wild-a\.example\..*3600.IN.A" dig.out.ns${ns}.test$n >/dev/null || ret=1
+  fi
+  n=$((n + 1))
+  if [ $ret != 0 ]; then echo_i "failed"; fi
+  status=$((status + ret))
+
+  echo_i "check synthesized wildcard CNAME response (synth-from-dnssec ${description};) ($n)"
+  ret=0
+  dig_with_opts b.wild-cname.example. @10.53.0.${ns} a >dig.out.ns${ns}.test$n || ret=1
+  grep "flags:[^;]* ad[ ;]" dig.out.ns${ns}.test$n >/dev/null || ret=1
+  grep "status: NOERROR," dig.out.ns${ns}.test$n >/dev/null || ret=1
+  if [ ${synth} = yes ]; then
+    grep "b.wild-cname.example.*IN.CNAME" dig.out.ns${ns}.test$n >/dev/null || ret=1
+    grep "b.wild-cname.example.*3600.IN.CNAME" dig.out.ns${ns}.test$n >/dev/null && ret=1
+  else
+    grep "b.wild-cname.example.*3600.IN.CNAME" dig.out.ns${ns}.test$n >/dev/null || ret=1
+  fi
+  grep "ns1.example.*.IN.A" dig.out.ns${ns}.test$n >/dev/null || ret=1
+  n=$((n + 1))
+  if [ $ret != 0 ]; then echo_i "failed"; fi
+  status=$((status + ret))
 done
 
 echo_i "check redirect response (+dnssec) (synth-from-dnssec <default>;) ($n)"
 ret=0
-dig_with_opts b.redirect. @10.53.0.3 a > dig.out.ns2.test$n || ret=1
-grep "flags:[^;]* ad[ ;]" dig.out.ns2.test$n > /dev/null || ret=1
-grep "status: NXDOMAIN," dig.out.ns2.test$n > /dev/null || ret=1
-grep "\..*3600.IN.SOA" dig.out.ns2.test$n > /dev/null || ret=1
-n=$((n+1))
+dig_with_opts b.redirect. @10.53.0.3 a >dig.out.ns2.test$n || ret=1
+grep "flags:[^;]* ad[ ;]" dig.out.ns2.test$n >/dev/null || ret=1
+grep "status: NXDOMAIN," dig.out.ns2.test$n >/dev/null || ret=1
+grep "\..*3600.IN.SOA" dig.out.ns2.test$n >/dev/null || ret=1
+n=$((n + 1))
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=$((status+ret))
+status=$((status + ret))
 
 echo_i "check redirect response (+nodnssec) (synth-from-dnssec <default>;) ($n)"
 ret=0
-dig_with_opts +nodnssec b.redirect. @10.53.0.3 a > dig.out.ns2.test$n || ret=1
-grep "flags:[^;]* ad[ ;]" dig.out.ns2.test$n > /dev/null && ret=1
-grep "status: NOERROR," dig.out.ns2.test$n > /dev/null || ret=1
-grep 'b\.redirect\..*300.IN.A.100\.100\.100\.2' dig.out.ns2.test$n > /dev/null || ret=1
-n=$((n+1))
+dig_with_opts +nodnssec b.redirect. @10.53.0.3 a >dig.out.ns2.test$n || ret=1
+grep "flags:[^;]* ad[ ;]" dig.out.ns2.test$n >/dev/null && ret=1
+grep "status: NOERROR," dig.out.ns2.test$n >/dev/null || ret=1
+grep 'b\.redirect\..*300.IN.A.100\.100\.100\.2' dig.out.ns2.test$n >/dev/null || ret=1
+n=$((n + 1))
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=$((status+ret))
-
+status=$((status + ret))
 
 echo_i "check DNAME handling (synth-from-dnssec yes;) ($n)"
 ret=0
-dig_with_opts dnamed.example. ns @10.53.0.5 > dig.out.ns5.test$n || ret=1
-dig_with_opts a.dnamed.example. a @10.53.0.5 > dig.out.ns5-1.test$n || ret=1
-grep "status: NOERROR," dig.out.ns5-1.test$n > /dev/null || ret=1
-n=$((n+1))
+dig_with_opts dnamed.example. ns @10.53.0.5 >dig.out.ns5.test$n || ret=1
+dig_with_opts a.dnamed.example. a @10.53.0.5 >dig.out.ns5-1.test$n || ret=1
+grep "status: NOERROR," dig.out.ns5-1.test$n >/dev/null || ret=1
+n=$((n + 1))
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=$((status+ret))
+status=$((status + ret))
 
 echo_i "exit status: $status"
 [ $status -eq 0 ] || exit 1