From ca6171b2f5ad0592f1005e69be3f9d0f759d6580 Mon Sep 17 00:00:00 2001 From: Matthijs Mekking Date: Thu, 12 Oct 2023 13:56:46 +0200 Subject: [PATCH] Update addzone test Now that inline-signing is ignored when there is no dnssec-policy, add 'dnssec-policy default;' to the zones when attempting to add them via 'rndc addzone'. --- bin/tests/system/addzone/tests.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/tests/system/addzone/tests.sh b/bin/tests/system/addzone/tests.sh index af0e3a63c8..503f365837 100755 --- a/bin/tests/system/addzone/tests.sh +++ b/bin/tests/system/addzone/tests.sh @@ -277,7 +277,7 @@ if [ $ret != 0 ]; then echo_i "failed"; fi status=$((status + ret)) echo_i "attempting to add primary zone with inline signing ($n)" -$RNDCCMD 10.53.0.2 addzone 'inline.example { type primary; file "inline.db"; inline-signing yes; };' 2>&1 | sed 's/^/I:ns2 /' +$RNDCCMD 10.53.0.2 addzone 'inline.example { type primary; file "inline.db"; dnssec-policy default; inline-signing yes; };' 2>&1 | sed 's/^/I:ns2 /' _check_add_primary_zone_with_inline() ( $DIG $DIGOPTS @10.53.0.2 a.inline.example a > dig.out.ns2.$n && grep 'status: NOERROR' dig.out.ns2.$n > /dev/null && @@ -290,14 +290,14 @@ status=$((status + ret)) echo_i "attempting to add primary zone with inline signing and missing file ($n)" ret=0 -$RNDCCMD 10.53.0.2 addzone 'inlinemissing.example { type primary; file "missing.db"; inline-signing yes; };' 2> rndc.out.ns2.$n && ret=1 +$RNDCCMD 10.53.0.2 addzone 'inlinemissing.example { type primary; file "missing.db"; dnssec-policy default; inline-signing yes; };' 2> rndc.out.ns2.$n && ret=1 grep "file not found" rndc.out.ns2.$n > /dev/null || ret=1 n=$((n + 1)) if [ $ret != 0 ]; then echo_i "failed"; fi status=$((status + ret)) echo_i "attempting to add secondary zone with inline signing ($n)" -$RNDCCMD 10.53.0.2 addzone 'inlinesec.example { type secondary; primaries { 10.53.0.1; }; file "inlinesec.bk"; inline-signing yes; };' 2>&1 | sed 's/^/I:ns2 /' +$RNDCCMD 10.53.0.2 addzone 'inlinesec.example { type secondary; primaries { 10.53.0.1; }; file "inlinesec.bk"; dnssec-policy default; inline-signing yes; };' 2>&1 | sed 's/^/I:ns2 /' _check_add_secondary_with_inline() ( $DIG $DIGOPTS @10.53.0.2 a.inlinesec.example a > dig.out.ns2.$n && grep 'status: NOERROR' dig.out.ns2.$n > /dev/null && @@ -324,7 +324,7 @@ n=$((n + 1)) status=$((status + ret)) echo_i "restoring secondary zone with inline signing ($n)" -$RNDCCMD 10.53.0.2 addzone 'inlinesec.example { type secondary; primaries { 10.53.0.1; }; file "inlinesec.bk"; inline-signing yes; };' 2>&1 | sed 's/^/I:ns2 /' +$RNDCCMD 10.53.0.2 addzone 'inlinesec.example { type secondary; primaries { 10.53.0.1; }; file "inlinesec.bk"; dnssec-policy default; inline-signing yes; };' 2>&1 | sed 's/^/I:ns2 /' _check_restoring_secondary_with_inline() ( $DIG $DIGOPTS @10.53.0.2 a.inlinesec.example a > dig.out.ns2.$n && grep 'status: NOERROR' dig.out.ns2.$n > /dev/null &&