remove "dnssec-enable" from all system tests

diff --git a/bin/tests/system/autosign/ns1/named.conf.in b/bin/tests/system/autosign/ns1/named.conf.in
index 8c2e86c070da66f19b0e08c29e39f58dd965f7bf..426482d3ba70e14cd0296f82924a61b96e3b5ddd 100644 (file)
--- a/bin/tests/system/autosign/ns1/named.conf.in
+++ b/bin/tests/system/autosign/ns1/named.conf.in
@@ -21,7 +21,6 @@ options {
        listen-on-v6 { none; };
        recursion no;
        notify yes;
-       dnssec-enable yes;
        dnssec-validation yes;
 };
 

diff --git a/bin/tests/system/autosign/ns2/named.conf.in b/bin/tests/system/autosign/ns2/named.conf.in
index 9f0c617f769ffc7954dc02aa72d8ced33a06b1e1..b56c294d96c37a0bde1f232ca3ddca62b8740e31 100644 (file)
--- a/bin/tests/system/autosign/ns2/named.conf.in
+++ b/bin/tests/system/autosign/ns2/named.conf.in
@@ -21,7 +21,6 @@ options {
        listen-on-v6 { none; };
        recursion no;
        notify yes;
-       dnssec-enable yes;
        dnssec-validation yes;
        dnssec-loadkeys-interval 30;
 };

diff --git a/bin/tests/system/autosign/ns3/named.conf.in b/bin/tests/system/autosign/ns3/named.conf.in
index dbb7435511081f98fb8514e6e3e654f6870106d3..7f491fef9c2f5036c770501a9206790d8c12b804 100644 (file)
--- a/bin/tests/system/autosign/ns3/named.conf.in
+++ b/bin/tests/system/autosign/ns3/named.conf.in
@@ -24,7 +24,6 @@ options {
        listen-on-v6 { none; };
        recursion no;
        notify yes;
-       dnssec-enable yes;
        dnssec-validation yes;
        dnssec-loadkeys-interval 10;
        allow-new-zones yes;

diff --git a/bin/tests/system/autosign/ns4/named.conf.in b/bin/tests/system/autosign/ns4/named.conf.in
index 5c0d8b603f249577f97590f20b32a686cacd05e7..de98ac28f6ee46b120b558dce914eda44cab7ff0 100644 (file)
--- a/bin/tests/system/autosign/ns4/named.conf.in
+++ b/bin/tests/system/autosign/ns4/named.conf.in
@@ -20,7 +20,6 @@ options {
        listen-on { 10.53.0.4; };
        listen-on-v6 { none; };
        recursion yes;
-       dnssec-enable yes;
        dnssec-validation yes;
        dnssec-must-be-secure mustbesecure.example yes;
 };

diff --git a/bin/tests/system/autosign/ns5/named.conf.in b/bin/tests/system/autosign/ns5/named.conf.in
index 5684cee7ef90b0ef8b74bbe1b593de6e21c70cad..a271401c4e74fec5d76e1c52a245ee79c08545a0 100644 (file)
--- a/bin/tests/system/autosign/ns5/named.conf.in
+++ b/bin/tests/system/autosign/ns5/named.conf.in
@@ -20,7 +20,6 @@ options {
        listen-on { 10.53.0.5; };
        listen-on-v6 { none; };
        recursion yes;
-       dnssec-enable yes;
        dnssec-validation yes;
 };
 

diff --git a/bin/tests/system/checkconf/dnssec.1 b/bin/tests/system/checkconf/dnssec.1
index 176711fc06a0e923f9b3b5d29f31b07c72a0bd38..82f4414973f3b5f508005b898df00b050461f324 100644 (file)
--- a/bin/tests/system/checkconf/dnssec.1
+++ b/bin/tests/system/checkconf/dnssec.1
@@ -11,5 +11,4 @@
 
 options {
        dnssec-enable no;
-       dnssec-validation yes;
 };

diff --git a/bin/tests/system/checkconf/dnssec.2 b/bin/tests/system/checkconf/dnssec.2
index 64db848ab1c855da9591dfa2df1c568d1a9f0efd..edef76fde7cbce9966cfa37b431ab7ea8c0bb2c6 100644 (file)
--- a/bin/tests/system/checkconf/dnssec.2
+++ b/bin/tests/system/checkconf/dnssec.2
@@ -9,10 +9,6 @@
  * information regarding copyright ownership.
  */
 
-options {
-       dnssec-enable no;
-};
-
 view view1 {
        match-clients { any; };
        dnssec-validation yes;

diff --git a/bin/tests/system/checkconf/dnssec.3 b/bin/tests/system/checkconf/dnssec.3
index fbb5882deb902bd63924900064911e4334b88cc0..a48d9c97a10348c1a1e50ce32be21bd12130bb8d 100644 (file)
--- a/bin/tests/system/checkconf/dnssec.3
+++ b/bin/tests/system/checkconf/dnssec.3
@@ -9,18 +9,12 @@
  * information regarding copyright ownership.
  */
 
-options {
-       dnssec-validation no;
-};
-
 view view1 {
        match-clients { any; };
-       dnssec-enable no;
 };
 
 view view2 {
        match-clients { none; };
-       dnssec-enable yes;
 };
 
 view view3 {

diff --git a/bin/tests/system/checkconf/tests.sh b/bin/tests/system/checkconf/tests.sh
index ec3bc04e1b0b9c25684a95922ecba09aabc4a16b..fa6c4da16bcb96440bddca342a923e20e5f4ebe9 100644 (file)
--- a/bin/tests/system/checkconf/tests.sh
+++ b/bin/tests/system/checkconf/tests.sh
@@ -111,11 +111,11 @@ status=`expr $status + $ret`
 n=`expr $n + 1`
 echo_i "checking named-checkconf dnssec warnings ($n)"
 ret=0
-$CHECKCONF dnssec.1 2>&1 | grep 'validation yes.*enable no' > /dev/null || ret=1
+# dnssec.1: dnssec-enable is obsolete
+$CHECKCONF dnssec.1 2>&1 | grep "'dnssec-enable' is obsolete and should be removed" > /dev/null || ret=1
+# dnssec.2: auto-dnssec warning
 $CHECKCONF dnssec.2 2>&1 | grep 'auto-dnssec may only be ' > /dev/null || ret=1
-$CHECKCONF dnssec.2 2>&1 | grep 'validation auto.*enable no' > /dev/null || ret=1
-$CHECKCONF dnssec.2 2>&1 | grep 'validation yes.*enable no' > /dev/null || ret=1
-# this one should have no warnings
+# dnssec.3: should have no warnings
 $CHECKCONF dnssec.3 2>&1 | grep '.*' && ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`

diff --git a/bin/tests/system/database/ns1/named1.conf.in b/bin/tests/system/database/ns1/named1.conf.in
index 8fa82ae050f49685b3a74e1c16d2a9c7c2eecb42..b6c838ac2dd377c9efc2ea2219f3f5739c3e38ca 100644 (file)
--- a/bin/tests/system/database/ns1/named1.conf.in
+++ b/bin/tests/system/database/ns1/named1.conf.in
@@ -30,7 +30,6 @@ options {
        listen-on-v6 { none; };
        recursion no;
        notify yes;
-       dnssec-enable yes;
        dnssec-validation yes;
 };
 

diff --git a/bin/tests/system/database/ns1/named2.conf.in b/bin/tests/system/database/ns1/named2.conf.in
index 8238f548b7acb318d8bb03e646ab907ef78b09c1..8b0c3f193848e6a8bee4f08d7119a7a6c2c609e7 100644 (file)
--- a/bin/tests/system/database/ns1/named2.conf.in
+++ b/bin/tests/system/database/ns1/named2.conf.in
@@ -30,7 +30,6 @@ options {
        listen-on-v6 { none; };
        recursion no;
        notify yes;
-       dnssec-enable yes;
        dnssec-validation yes;
 };
 

diff --git a/bin/tests/system/digdelv/ns1/named.conf.in b/bin/tests/system/digdelv/ns1/named.conf.in
index 92acac9f4af344b3ebd3418d208b2b992213edd3..066e453d7677ebb8fbe8be99472a053f09fc96f0 100644 (file)
--- a/bin/tests/system/digdelv/ns1/named.conf.in
+++ b/bin/tests/system/digdelv/ns1/named.conf.in
@@ -19,7 +19,6 @@ options {
        listen-on-v6 { fd92:7065:b8e:ffff::1; };
        recursion no;
        notify yes;
-       dnssec-enable no;
        dnssec-validation no;
 };
 

diff --git a/bin/tests/system/digdelv/ns2/named.conf.in b/bin/tests/system/digdelv/ns2/named.conf.in
index 98bc5ac38e82e258c8481ef9c2ec0ab25b504af8..8dafd87b3dbc48e88c2953b3248d536c169ebed5 100644 (file)
--- a/bin/tests/system/digdelv/ns2/named.conf.in
+++ b/bin/tests/system/digdelv/ns2/named.conf.in
@@ -18,7 +18,6 @@ options {
        listen-on { 10.53.0.2; };
        listen-on-v6 { fd92:7065:b8e:ffff::2; };
        recursion no;
-       dnssec-enable no;
        dnssec-validation no;
 };
 

diff --git a/bin/tests/system/digdelv/ns3/named.conf.in b/bin/tests/system/digdelv/ns3/named.conf.in
index b18b44413b8c4bea9bdd1806ea2b90a1a293c5aa..5017085f70a816abb970e48a0329dd1c03a82f11 100644 (file)
--- a/bin/tests/system/digdelv/ns3/named.conf.in
+++ b/bin/tests/system/digdelv/ns3/named.conf.in
@@ -16,7 +16,6 @@ options {
        listen-on { 10.53.0.3; };
        listen-on-v6 { fd92:7065:b8e:ffff::3; };
        recursion yes;
-       dnssec-enable no;
        dnssec-validation no;
        server-id "ns3";
 };

diff --git a/bin/tests/system/dlv/ns1/named.conf.in b/bin/tests/system/dlv/ns1/named.conf.in
index 337558f9557c821bc1e41c1850616bff93de67ce..e628dbe36d647fbff8528a29cd7d04dc0f236238 100644 (file)
--- a/bin/tests/system/dlv/ns1/named.conf.in
+++ b/bin/tests/system/dlv/ns1/named.conf.in
@@ -19,7 +19,6 @@ options {
        listen-on-v6 { none; };
        recursion no;
        notify yes;
-       dnssec-enable yes;
 };
 
 zone "." { type master; file "root.signed"; };

diff --git a/bin/tests/system/dlv/ns2/named.conf.in b/bin/tests/system/dlv/ns2/named.conf.in
index b08bd13a031e24c3bd0de072ceae238fdd13a60b..a098365ab54fd72cb6773a87ccf50303b1cfbf72 100644 (file)
--- a/bin/tests/system/dlv/ns2/named.conf.in
+++ b/bin/tests/system/dlv/ns2/named.conf.in
@@ -19,7 +19,6 @@ options {
        listen-on-v6 { none; };
        recursion no;
        notify yes;
-       dnssec-enable yes;
 };
 
 zone "." { type hint; file "hints"; };

diff --git a/bin/tests/system/dlv/ns3/named.conf.in b/bin/tests/system/dlv/ns3/named.conf.in
index 42d712b229fefdfeadd6dd4647e981369ff2f2bc..7a9b44d2e9ac33cc9768c77c41ddbe0af4281ee5 100644 (file)
--- a/bin/tests/system/dlv/ns3/named.conf.in
+++ b/bin/tests/system/dlv/ns3/named.conf.in
@@ -19,7 +19,6 @@ options {
        listen-on-v6 { none; };
        recursion no;
        notify yes;
-       dnssec-enable yes;
 };
 
 zone "." { type hint; file "hints"; };

diff --git a/bin/tests/system/dlv/ns4/named.conf.in b/bin/tests/system/dlv/ns4/named.conf.in
index 805b5f3335b120d285d6f041683d7c6a2e6ccecc..a98dd6b92b4f89b48804d11bf89f49231bddb60b 100644 (file)
--- a/bin/tests/system/dlv/ns4/named.conf.in
+++ b/bin/tests/system/dlv/ns4/named.conf.in
@@ -19,7 +19,6 @@ options {
        listen-on-v6 { none; };
        recursion no;
        notify yes;
-       dnssec-enable no;
 };
 
 zone "." { type hint; file "hints"; };

diff --git a/bin/tests/system/dlv/ns5/named.conf.in b/bin/tests/system/dlv/ns5/named.conf.in
index 11c6041fb9166268dcc6b311cdc0620209df62c8..489306e3c74474a53133b96d26031669e1028f45 100644 (file)
--- a/bin/tests/system/dlv/ns5/named.conf.in
+++ b/bin/tests/system/dlv/ns5/named.conf.in
@@ -22,7 +22,6 @@ options {
        listen-on-v6 { none; };
        recursion yes;
        notify yes;
-       dnssec-enable yes;
        dnssec-validation yes;
        dnssec-lookaside "." trust-anchor "dlv.utld";
 };

diff --git a/bin/tests/system/dlv/ns6/named.conf.in b/bin/tests/system/dlv/ns6/named.conf.in
index fe5c68df6dcb85c93a3dc6ec8fcedf48236f1cdd..15583c2a4c588a56fd36e6c8249b6455b4cdaebc 100644 (file)
--- a/bin/tests/system/dlv/ns6/named.conf.in
+++ b/bin/tests/system/dlv/ns6/named.conf.in
@@ -19,7 +19,6 @@ options {
        listen-on-v6 { none; };
        recursion no;
        notify yes;
-       dnssec-enable yes;
 };
 
 zone "." { type hint; file "hints"; };

diff --git a/bin/tests/system/dns64/ns1/named.conf.in b/bin/tests/system/dns64/ns1/named.conf.in
index d8faa1137d0576155dbb91532367146d17ca132f..778c0bc9a53382325620dc84fba03ddfdd53052d 100644 (file)
--- a/bin/tests/system/dns64/ns1/named.conf.in
+++ b/bin/tests/system/dns64/ns1/named.conf.in
@@ -23,7 +23,6 @@ options {
        listen-on-v6 { none; };
        allow-recursion { 10.53.0.1; };
        notify yes;
-       dnssec-enable yes;
        dnssec-validation yes;
 
        dns64 2001:bbbb::/96 {

diff --git a/bin/tests/system/dns64/ns2/named.conf.in b/bin/tests/system/dns64/ns2/named.conf.in
index 070fdecb38751c0bb1faa1e9c12ab3999fb41ae0..386a9d740b939d16e1206651d9af5d44aff9c44a 100644 (file)
--- a/bin/tests/system/dns64/ns2/named.conf.in
+++ b/bin/tests/system/dns64/ns2/named.conf.in
@@ -23,7 +23,6 @@ options {
        listen-on-v6 { none; };
        recursion yes;
        notify yes;
-       dnssec-enable yes;
        dnssec-validation yes;
 
        dns64 2001:aaaa::/96 {

diff --git a/bin/tests/system/dnssec/ns1/named.conf.in b/bin/tests/system/dnssec/ns1/named.conf.in
index 4401f59561217c9117fdba2c31dc5312eb66d7f7..68d7993a2b3ca45e333bc0eb6b157d5682ed9951 100644 (file)
--- a/bin/tests/system/dnssec/ns1/named.conf.in
+++ b/bin/tests/system/dnssec/ns1/named.conf.in
@@ -21,7 +21,6 @@ options {
        listen-on-v6 { none; };
        recursion no;
        notify yes;
-       dnssec-enable yes;
        dnssec-validation yes;
        /* test that we can turn off trust-anchor-telemetry */
        trust-anchor-telemetry no;

diff --git a/bin/tests/system/dnssec/ns2/named.conf.in b/bin/tests/system/dnssec/ns2/named.conf.in
index 4f0563281812f23c48f013941eb4cc2b67c0f513..558eaecf49159c8194a8bf2719548aa276e25050 100644 (file)
--- a/bin/tests/system/dnssec/ns2/named.conf.in
+++ b/bin/tests/system/dnssec/ns2/named.conf.in
@@ -21,7 +21,6 @@ options {
        listen-on-v6 { none; };
        recursion no;
        notify yes;
-       dnssec-enable yes;
        dnssec-validation yes;
        notify-delay 1;
        minimal-responses no;

diff --git a/bin/tests/system/dnssec/ns3/named.conf.in b/bin/tests/system/dnssec/ns3/named.conf.in
index fc43832b4e1a7df25b60d8f2d44d4a8b353cf2c8..18268d797599072469f41bb67b4b6ec3d5cf6dfc 100644 (file)
--- a/bin/tests/system/dnssec/ns3/named.conf.in
+++ b/bin/tests/system/dnssec/ns3/named.conf.in
@@ -21,7 +21,6 @@ options {
        listen-on-v6 { none; };
        recursion no;
        notify yes;
-       dnssec-enable yes;
        dnssec-validation yes;
        session-keyfile "session.key";
        minimal-responses no;

diff --git a/bin/tests/system/dnssec/ns4/named1.conf.in b/bin/tests/system/dnssec/ns4/named1.conf.in
index f74a4058ce0319bfe3aa13a0314e7b07315e8172..9559a00c017d27aaf7f59cbc7c6853940f3a0563 100644 (file)
--- a/bin/tests/system/dnssec/ns4/named1.conf.in
+++ b/bin/tests/system/dnssec/ns4/named1.conf.in
@@ -20,7 +20,6 @@ options {
        listen-on { 10.53.0.4; };
        listen-on-v6 { none; };
        recursion yes;
-       dnssec-enable yes;
        dnssec-validation yes;
        dnssec-must-be-secure mustbesecure.example yes;
        minimal-responses no;

diff --git a/bin/tests/system/dnssec/ns4/named2.conf.in b/bin/tests/system/dnssec/ns4/named2.conf.in
index 50025ac8cfcec44c8426b0584ece2dedf0016cd7..f1ec3620326f8fcf51a5b1ff2b28152340f88ef2 100644 (file)
--- a/bin/tests/system/dnssec/ns4/named2.conf.in
+++ b/bin/tests/system/dnssec/ns4/named2.conf.in
@@ -21,7 +21,6 @@ options {
        listen-on { 10.53.0.4; };
        listen-on-v6 { none; };
        recursion yes;
-       dnssec-enable yes;
        dnssec-validation auto;
        bindkeys-file "managed.conf";
        minimal-responses no;

diff --git a/bin/tests/system/dnssec/ns4/named3.conf.in b/bin/tests/system/dnssec/ns4/named3.conf.in
index b0ac3cce76117f76aa58a43ae71aff217191b15a..097ed33de4ed831620bc36dcccc21351bade2bd8 100644 (file)
--- a/bin/tests/system/dnssec/ns4/named3.conf.in
+++ b/bin/tests/system/dnssec/ns4/named3.conf.in
@@ -20,7 +20,6 @@ options {
        listen-on { 10.53.0.4; };
        listen-on-v6 { none; };
        recursion yes;
-       dnssec-enable yes;
        dnssec-validation auto;
        bindkeys-file "managed.conf";
        dnssec-accept-expired yes;

diff --git a/bin/tests/system/dnssec/ns4/named5.conf.in b/bin/tests/system/dnssec/ns4/named5.conf.in
index 4ec428f07a63fc839f37e9467904c98e5331d2bc..7ab0eb6946407f0a63f2029b4f7e7d2105bc3d51 100644 (file)
--- a/bin/tests/system/dnssec/ns4/named5.conf.in
+++ b/bin/tests/system/dnssec/ns4/named5.conf.in
@@ -20,7 +20,6 @@ options {
        listen-on { 10.53.0.4; };
        listen-on-v6 { none; };
        bindkeys-file "managed.conf";
-       dnssec-enable no;
 };
 
 key rndc_key {

diff --git a/bin/tests/system/dnssec/ns5/named1.conf.in b/bin/tests/system/dnssec/ns5/named1.conf.in
index 2883d50bad8f3e8f238549dddfab9da4fe1d0bb9..62d43b5ff7e4da46c431bd33ae7218436b042066 100644 (file)
--- a/bin/tests/system/dnssec/ns5/named1.conf.in
+++ b/bin/tests/system/dnssec/ns5/named1.conf.in
@@ -20,7 +20,6 @@ options {
        listen-on { 10.53.0.5; };
        listen-on-v6 { none; };
        recursion yes;
-       dnssec-enable yes;
        dnssec-validation yes;
 };
 

diff --git a/bin/tests/system/dnssec/ns6/named.conf.in b/bin/tests/system/dnssec/ns6/named.conf.in
index 57e6b57fed9b70c908a3020176c41da0ffb8a252..61a7cce5a4cb494be78be2476db9830150f04170 100644 (file)
--- a/bin/tests/system/dnssec/ns6/named.conf.in
+++ b/bin/tests/system/dnssec/ns6/named.conf.in
@@ -22,7 +22,6 @@ options {
        recursion yes;
        notify yes;
        disable-algorithms . { @ALTERNATIVE_ALGORITHM@; };
-       dnssec-enable yes;
        dnssec-validation yes;
        dnssec-lookaside . trust-anchor dlv;
 };

diff --git a/bin/tests/system/dnssec/ns7/named.conf.in b/bin/tests/system/dnssec/ns7/named.conf.in
index 2dc2a9cc901d150f60722c9c8c4f4a8f49a9ef23..31e3f85cdce84807fc77073b3ac58865a625081a 100644 (file)
--- a/bin/tests/system/dnssec/ns7/named.conf.in
+++ b/bin/tests/system/dnssec/ns7/named.conf.in
@@ -21,7 +21,6 @@ options {
        listen-on-v6 { none; };
        recursion no;
        notify yes;
-       dnssec-enable yes;
        dnssec-validation yes;
        minimal-responses yes;
 };

diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh
index de4d42d94827b65f25d1599860797097c78293e3..5fbc31f9231fd72c6a8a9d59011c72fbd3003f16 100644 (file)
--- a/bin/tests/system/dnssec/tests.sh
+++ b/bin/tests/system/dnssec/tests.sh
@@ -3648,20 +3648,5 @@ n=$((n+1))
 test "$ret" -eq 0 || echo_i "failed"
 status=$((status+ret))
 
-# Note: after this check, ns4 will not be validating any more; do not add any
-# further validation tests employing ns4 below this check.
-echo_i "check that validation defaults to off when dnssec-enable is off ($n)"
-ret=0
-# Sanity check - validation should be enabled.
-rndccmd 10.53.0.4 validation status | grep "enabled" > /dev/null || ret=1
-# Set "dnssec-enable" to "no" and reconfigure.
-copy_setports ns4/named5.conf.in ns4/named.conf
-rndccmd 10.53.0.4 reconfig 2>&1 | sed 's/^/ns4 /' | cat_i
-# Check validation status again.
-rndccmd 10.53.0.4 validation status | grep "disabled" > /dev/null || ret=1
-n=$((n+1))
-test "$ret" -eq 0 || echo_i "failed"
-status=$((status+ret))
-
 echo_i "exit status: $status"
 [ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/dsdigest/ns1/named.conf.in b/bin/tests/system/dsdigest/ns1/named.conf.in
index 215800cab08f1099d187d8791140996891eb390a..88a254793575ff4b7d7cf6b2c73f382075fd8229 100644 (file)
--- a/bin/tests/system/dsdigest/ns1/named.conf.in
+++ b/bin/tests/system/dsdigest/ns1/named.conf.in
@@ -23,7 +23,6 @@ options {
        listen-on-v6 { none; };
        recursion no;
        notify yes;
-       dnssec-enable yes;
        dnssec-validation yes;
 };
 

diff --git a/bin/tests/system/dsdigest/ns2/named.conf.in b/bin/tests/system/dsdigest/ns2/named.conf.in
index 73a41ba8d770a1f435bbe7ed5228dcfb93b33c65..6510dd5e92a3ed1ef9ed38af5e93aeac104339db 100644 (file)
--- a/bin/tests/system/dsdigest/ns2/named.conf.in
+++ b/bin/tests/system/dsdigest/ns2/named.conf.in
@@ -23,7 +23,6 @@ options {
        listen-on-v6 { none; };
        recursion no;
        notify yes;
-       dnssec-enable yes;
        dnssec-validation yes;
 };
 

diff --git a/bin/tests/system/dsdigest/ns3/named.conf.in b/bin/tests/system/dsdigest/ns3/named.conf.in
index 04b4a5e93aef4941da32a6eabb95a65006399611..97bfe26687c5788eb234604ad138c50b03c70824 100644 (file)
--- a/bin/tests/system/dsdigest/ns3/named.conf.in
+++ b/bin/tests/system/dsdigest/ns3/named.conf.in
@@ -22,7 +22,6 @@ options {
        listen-on { 10.53.0.3; };
        listen-on-v6 { none; };
        recursion yes;
-       dnssec-enable yes;
        dnssec-validation yes;
        dnssec-must-be-secure . yes;
        /* only SHA-256 is enabled */

diff --git a/bin/tests/system/dsdigest/ns4/named.conf.in b/bin/tests/system/dsdigest/ns4/named.conf.in
index 5047a287d3a1824775606b48b21551d166b431c8..91f21a6e015cd5d677f9dfd477eb52b315e0a7b7 100644 (file)
--- a/bin/tests/system/dsdigest/ns4/named.conf.in
+++ b/bin/tests/system/dsdigest/ns4/named.conf.in
@@ -22,7 +22,6 @@ options {
        listen-on { 10.53.0.4; };
        listen-on-v6 { none; };
        recursion yes;
-       dnssec-enable yes;
        dnssec-validation yes;
        /* only SHA-256 is enabled */
        disable-ds-digests . { SHA-1; SHA-384; 5; 6; 7; 8; 9; };

diff --git a/bin/tests/system/ecdsa/ns1/named.conf b/bin/tests/system/ecdsa/ns1/named.conf
index 715f7d3f7690d80f924cd63bc6e2cc27e9c2f270..50eb0484085b81f8edbb10fd2cb2a77f081d01b2 100644 (file)
--- a/bin/tests/system/ecdsa/ns1/named.conf
+++ b/bin/tests/system/ecdsa/ns1/named.conf
@@ -23,7 +23,6 @@ options {
        listen-on-v6 { none; };
        recursion no;
        notify yes;
-       dnssec-enable yes;
        dnssec-validation yes;
 };
 

diff --git a/bin/tests/system/ecdsa/ns2/named.conf b/bin/tests/system/ecdsa/ns2/named.conf
index 50621a53f1657bd18ffe630af0fb204f12f0e91a..420073fc05652fa39c3b6272054479cd9cc2a0bd 100644 (file)
--- a/bin/tests/system/ecdsa/ns2/named.conf
+++ b/bin/tests/system/ecdsa/ns2/named.conf
@@ -23,7 +23,6 @@ options {
        listen-on-v6 { none; };
        recursion yes;
        notify yes;
-       dnssec-enable yes;
        dnssec-validation yes;
 };
 

diff --git a/bin/tests/system/eddsa/ns1/named.conf b/bin/tests/system/eddsa/ns1/named.conf
index 715f7d3f7690d80f924cd63bc6e2cc27e9c2f270..50eb0484085b81f8edbb10fd2cb2a77f081d01b2 100644 (file)
--- a/bin/tests/system/eddsa/ns1/named.conf
+++ b/bin/tests/system/eddsa/ns1/named.conf
@@ -23,7 +23,6 @@ options {
        listen-on-v6 { none; };
        recursion no;
        notify yes;
-       dnssec-enable yes;
        dnssec-validation yes;
 };
 

diff --git a/bin/tests/system/eddsa/ns2/named.conf b/bin/tests/system/eddsa/ns2/named.conf
index 50621a53f1657bd18ffe630af0fb204f12f0e91a..420073fc05652fa39c3b6272054479cd9cc2a0bd 100644 (file)
--- a/bin/tests/system/eddsa/ns2/named.conf
+++ b/bin/tests/system/eddsa/ns2/named.conf
@@ -23,7 +23,6 @@ options {
        listen-on-v6 { none; };
        recursion yes;
        notify yes;
-       dnssec-enable yes;
        dnssec-validation yes;
 };
 

diff --git a/bin/tests/system/idna/ns1/named.conf.in b/bin/tests/system/idna/ns1/named.conf.in
index 92acac9f4af344b3ebd3418d208b2b992213edd3..066e453d7677ebb8fbe8be99472a053f09fc96f0 100644 (file)
--- a/bin/tests/system/idna/ns1/named.conf.in
+++ b/bin/tests/system/idna/ns1/named.conf.in
@@ -19,7 +19,6 @@ options {
        listen-on-v6 { fd92:7065:b8e:ffff::1; };
        recursion no;
        notify yes;
-       dnssec-enable no;
        dnssec-validation no;
 };
 

diff --git a/bin/tests/system/inline/ns1/named.conf.in b/bin/tests/system/inline/ns1/named.conf.in
index 215800cab08f1099d187d8791140996891eb390a..88a254793575ff4b7d7cf6b2c73f382075fd8229 100644 (file)
--- a/bin/tests/system/inline/ns1/named.conf.in
+++ b/bin/tests/system/inline/ns1/named.conf.in
@@ -23,7 +23,6 @@ options {
        listen-on-v6 { none; };
        recursion no;
        notify yes;
-       dnssec-enable yes;
        dnssec-validation yes;
 };
 

diff --git a/bin/tests/system/masterfile/ns2/named.conf.in b/bin/tests/system/masterfile/ns2/named.conf.in
index 96e7978c43e9acaa1224344a25fe44fa53a8dec9..33201e4e38ed9c65a04c0a2c858af01ce911678a 100644 (file)
--- a/bin/tests/system/masterfile/ns2/named.conf.in
+++ b/bin/tests/system/masterfile/ns2/named.conf.in
@@ -21,7 +21,6 @@ options {
        listen-on-v6 { none; };
        recursion no;
        notify yes;
-       dnssec-enable yes;
        dnssec-validation yes;
 };
 

diff --git a/bin/tests/system/masterformat/ns1/named.conf.in b/bin/tests/system/masterformat/ns1/named.conf.in
index e986041d2b595d7f871cbdd3e99268f70195aef3..c1d92b7ffbce43c7286e9010aac5fe871133bb77 100644 (file)
--- a/bin/tests/system/masterformat/ns1/named.conf.in
+++ b/bin/tests/system/masterformat/ns1/named.conf.in
@@ -18,7 +18,6 @@ options {
        listen-on-v6 { none; };
        recursion no;
        notify no;
-       dnssec-enable yes;
        session-keyfile "session.key";
        servfail-ttl 0;
 };

diff --git a/bin/tests/system/masterformat/ns2/named.conf.in b/bin/tests/system/masterformat/ns2/named.conf.in
index ae2860320731c3bec5b3bc39607616ffdf3fe069..fb519466f404dae0b634cbf4f2f3915b65ca6b6b 100644 (file)
--- a/bin/tests/system/masterformat/ns2/named.conf.in
+++ b/bin/tests/system/masterformat/ns2/named.conf.in
@@ -18,7 +18,6 @@ options {
        port @PORT@;
        recursion no;
        notify no;
-       dnssec-enable yes;
        servfail-ttl 0;
 };
 

diff --git a/bin/tests/system/masterformat/ns3/named.conf.in b/bin/tests/system/masterformat/ns3/named.conf.in
index f41dc2e83716ed11e22446ac2e431100e512eff5..032505a3002a5abbdd52a1234dd75cfb7834c5d7 100644 (file)
--- a/bin/tests/system/masterformat/ns3/named.conf.in
+++ b/bin/tests/system/masterformat/ns3/named.conf.in
@@ -18,7 +18,6 @@ options {
        listen-on-v6 { none; };
        recursion no;
        notify no;
-       dnssec-enable yes;
 };
 
 key rndc_key {

diff --git a/bin/tests/system/mkeys/ns1/named1.conf.in b/bin/tests/system/mkeys/ns1/named1.conf.in
index 412556b5c8cee823ae7d38c27500711a77d3d798..807cd00e9075b76525f9934d751c6d70a6e573d2 100644 (file)
--- a/bin/tests/system/mkeys/ns1/named1.conf.in
+++ b/bin/tests/system/mkeys/ns1/named1.conf.in
@@ -26,7 +26,6 @@ options {
        listen-on-v6 { none; };
        recursion no;
        notify no;
-       dnssec-enable yes;
        dnssec-validation yes;
        allow-query { allowed; };
 };

diff --git a/bin/tests/system/mkeys/ns1/named2.conf.in b/bin/tests/system/mkeys/ns1/named2.conf.in
index 5cb096b0849188fea49037c9d0f6976b71f78a7b..b9aae000e205d8789f1eac220bff4f6f5d778530 100644 (file)
--- a/bin/tests/system/mkeys/ns1/named2.conf.in
+++ b/bin/tests/system/mkeys/ns1/named2.conf.in
@@ -26,7 +26,6 @@ options {
        listen-on-v6 { none; };
        recursion no;
        notify no;
-       dnssec-enable yes;
        dnssec-validation yes;
        allow-query { allowed; };
 };

diff --git a/bin/tests/system/mkeys/ns1/named3.conf.in b/bin/tests/system/mkeys/ns1/named3.conf.in
index a0f1dd36c93392e0e960b3822183c1c985fd3ed3..9f563ad6a330060eef93ebc37549b83a12f83603 100644 (file)
--- a/bin/tests/system/mkeys/ns1/named3.conf.in
+++ b/bin/tests/system/mkeys/ns1/named3.conf.in
@@ -21,7 +21,6 @@ options {
        listen-on-v6 { none; };
        recursion no;
        notify no;
-       dnssec-enable yes;
        dnssec-validation yes;
 };
 

diff --git a/bin/tests/system/mkeys/ns2/named.conf.in b/bin/tests/system/mkeys/ns2/named.conf.in
index 9076243446b6e18b2488a57dc899cd4835bdeb22..d87bf18c51d5e80fc55b14ef85d3f3727591928a 100644 (file)
--- a/bin/tests/system/mkeys/ns2/named.conf.in
+++ b/bin/tests/system/mkeys/ns2/named.conf.in
@@ -21,7 +21,6 @@ options {
        listen-on-v6 { none; };
        recursion yes;
        notify no;
-       dnssec-enable yes;
        dnssec-validation auto;
        bindkeys-file "managed.conf";
        servfail-ttl 0;

diff --git a/bin/tests/system/mkeys/ns3/named.conf.in b/bin/tests/system/mkeys/ns3/named.conf.in
index 0227aba024968e8ea05bcb1e2c54c862d9061ed4..6720b3a63252e86ca80949079141e155e31ad069 100644 (file)
--- a/bin/tests/system/mkeys/ns3/named.conf.in
+++ b/bin/tests/system/mkeys/ns3/named.conf.in
@@ -21,7 +21,6 @@ options {
        listen-on-v6 { none; };
        recursion yes;
        notify no;
-       dnssec-enable yes;
        dnssec-validation yes;
        bindkeys-file "managed.conf";
        trust-anchor-telemetry no;

diff --git a/bin/tests/system/mkeys/ns4/named.conf.in b/bin/tests/system/mkeys/ns4/named.conf.in
index ab3844496a39444df186fb2ed624a7e292a890b0..e0adc97a515bb6c1085d6a440c9353d5a6eff94c 100644 (file)
--- a/bin/tests/system/mkeys/ns4/named.conf.in
+++ b/bin/tests/system/mkeys/ns4/named.conf.in
@@ -21,7 +21,6 @@ options {
        listen-on-v6 { none; };
        recursion yes;
        notify no;
-       dnssec-enable yes;
        dnssec-validation auto;
        bindkeys-file "managed.conf";
        managed-keys-directory "nope";

diff --git a/bin/tests/system/mkeys/ns5/named.conf.in b/bin/tests/system/mkeys/ns5/named.conf.in
index 631488897929c17de98715e358b6d29ab8d6d519..91f56138e708698848aeeb2c3c69a9ff916f3d8a 100644 (file)
--- a/bin/tests/system/mkeys/ns5/named.conf.in
+++ b/bin/tests/system/mkeys/ns5/named.conf.in
@@ -21,7 +21,6 @@ options {
        listen-on-v6 { none; };
        recursion yes;
        notify no;
-       dnssec-enable yes;
        dnssec-validation auto;
        bindkeys-file "managed.conf";
        servfail-ttl 0;

diff --git a/bin/tests/system/mkeys/ns6/named.conf.in b/bin/tests/system/mkeys/ns6/named.conf.in
index 8d76f7f2e76c492635fe093579bea1a21b0d92e2..23eb115be27c692ff6700da5f8df55b51bb17165 100644 (file)
--- a/bin/tests/system/mkeys/ns6/named.conf.in
+++ b/bin/tests/system/mkeys/ns6/named.conf.in
@@ -21,7 +21,6 @@ options {
        listen-on-v6 { none; };
        recursion yes;
        notify no;
-       dnssec-enable yes;
        dnssec-validation yes;
        trust-anchor-telemetry no;
 };

diff --git a/bin/tests/system/mkeys/ns7/named.conf.in b/bin/tests/system/mkeys/ns7/named.conf.in
index a9aba0073332e4f37f3f0f9b05a2c8f091749275..59959368aaf307f0cd0089768a28a881b77acc0d 100644 (file)
--- a/bin/tests/system/mkeys/ns7/named.conf.in
+++ b/bin/tests/system/mkeys/ns7/named.conf.in
@@ -21,7 +21,6 @@ options {
        listen-on-v6 { none; };
        recursion yes;
        notify no;
-       dnssec-enable yes;
        dnssec-validation auto;
        bindkeys-file "managed.conf";
 };

diff --git a/bin/tests/system/nsupdate/ns3/named.conf.in b/bin/tests/system/nsupdate/ns3/named.conf.in
index e5b414f67c69517d90abeaa0af0e94e7672b5ce0..504d6ebaa3a4249dd77b8594a861c02f94b5a07f 100644 (file)
--- a/bin/tests/system/nsupdate/ns3/named.conf.in
+++ b/bin/tests/system/nsupdate/ns3/named.conf.in
@@ -21,7 +21,6 @@ options {
        listen-on-v6 { none; };
        recursion no;
        notify yes;
-       dnssec-enable yes;
        dnssec-validation yes;
 };
 

diff --git a/bin/tests/system/pending/ns2/named.conf.in b/bin/tests/system/pending/ns2/named.conf.in
index df2e168272612b37152b5feeedcddfd7f7555d10..ef066e3289437587cd73dd31517fad2b2ca3e03c 100644 (file)
--- a/bin/tests/system/pending/ns2/named.conf.in
+++ b/bin/tests/system/pending/ns2/named.conf.in
@@ -23,7 +23,6 @@ options {
        listen-on-v6 { none; };
        recursion no;
        notify yes;
-       dnssec-enable yes;
        dnssec-validation yes;
 };
 

diff --git a/bin/tests/system/pending/ns3/named.conf.in b/bin/tests/system/pending/ns3/named.conf.in
index 97129c93dd2f70c69f36126ff2750580701ec87e..a701e8d2e3961dcc73fdaad5cbbce9a9cfe0a64f 100644 (file)
--- a/bin/tests/system/pending/ns3/named.conf.in
+++ b/bin/tests/system/pending/ns3/named.conf.in
@@ -23,7 +23,6 @@ options {
        listen-on-v6 { none; };
        recursion no;
        notify no;
-       dnssec-enable yes;
        dnssec-validation yes;
 };
 

diff --git a/bin/tests/system/redirect/ns1/named.conf.in b/bin/tests/system/redirect/ns1/named.conf.in
index 47b385a8fcab90e5528b594745cfa8fcf30a418b..8a61776b077e334b1c119445ffc432af878a9bd7 100644 (file)
--- a/bin/tests/system/redirect/ns1/named.conf.in
+++ b/bin/tests/system/redirect/ns1/named.conf.in
@@ -23,7 +23,6 @@ options {
        listen-on-v6 { none; };
        allow-recursion { 10.53.0.1; };
        notify yes;
-       dnssec-enable yes;
        dnssec-validation yes;
 };
 

diff --git a/bin/tests/system/redirect/ns2/named.conf.in b/bin/tests/system/redirect/ns2/named.conf.in
index 3e897900af8eee439944e1ad34fc3ba7118e25b4..0ab3bab559f6e8d45f943263c2cd277fc548d849 100644 (file)
--- a/bin/tests/system/redirect/ns2/named.conf.in
+++ b/bin/tests/system/redirect/ns2/named.conf.in
@@ -25,7 +25,6 @@ options {
        listen-on-v6 { none; };
        recursion yes;
        notify yes;
-       dnssec-enable yes;
        dnssec-validation yes;
 
 };

diff --git a/bin/tests/system/redirect/ns3/named.conf.in b/bin/tests/system/redirect/ns3/named.conf.in
index 04a651b065c95b3e39a780f28e91a2d4a7d37f1b..feab73cb12c4cd8757e3c9a4502b3aa37c976020 100644 (file)
--- a/bin/tests/system/redirect/ns3/named.conf.in
+++ b/bin/tests/system/redirect/ns3/named.conf.in
@@ -21,7 +21,6 @@ options {
        listen-on-v6 { none; };
        allow-recursion { 10.53.0.3; };
        notify yes;
-       dnssec-enable yes;
        dnssec-validation yes;
 };
 

diff --git a/bin/tests/system/redirect/ns4/named.conf.in b/bin/tests/system/redirect/ns4/named.conf.in
index 70f0df07f6c5b2be17cae7d0b1b17036810233ea..8e9a0afd19d8c7dda02ba1f5fa2333bd2fe1923b 100644 (file)
--- a/bin/tests/system/redirect/ns4/named.conf.in
+++ b/bin/tests/system/redirect/ns4/named.conf.in
@@ -25,7 +25,6 @@ options {
        listen-on-v6 { none; };
        recursion yes;
        notify yes;
-       dnssec-enable yes;
        dnssec-validation yes;
        nxdomain-redirect "redirect";
 

diff --git a/bin/tests/system/rootkeysentinel/ns1/named.conf.in b/bin/tests/system/rootkeysentinel/ns1/named.conf.in
index 6312ca1621239847c29fa67af966edcb0301e413..1cdab00a4b9abca9b40dadbe157dfb7d19364200 100644 (file)
--- a/bin/tests/system/rootkeysentinel/ns1/named.conf.in
+++ b/bin/tests/system/rootkeysentinel/ns1/named.conf.in
@@ -19,7 +19,6 @@ options {
        listen-on-v6 { none; };
        recursion no;
        notify yes;
-       dnssec-enable yes;
        dnssec-validation yes;
 };
 

diff --git a/bin/tests/system/rootkeysentinel/ns2/named.conf.in b/bin/tests/system/rootkeysentinel/ns2/named.conf.in
index 2da0567cd558122d02d0fc9b3e33497c62fdcda0..4ab4edaec5cff5ae01421f8847ee54a9c6b34460 100644 (file)
--- a/bin/tests/system/rootkeysentinel/ns2/named.conf.in
+++ b/bin/tests/system/rootkeysentinel/ns2/named.conf.in
@@ -19,7 +19,6 @@ options {
        listen-on-v6 { none; };
        recursion no;
        notify yes;
-       dnssec-enable yes;
        dnssec-validation yes;
 };
 

diff --git a/bin/tests/system/rootkeysentinel/ns3/named.conf.in b/bin/tests/system/rootkeysentinel/ns3/named.conf.in
index ea118ce4e506d95194665f5d5699a7a75a7f875f..68cb81500f8d16658754682f8440368f48f92c75 100644 (file)
--- a/bin/tests/system/rootkeysentinel/ns3/named.conf.in
+++ b/bin/tests/system/rootkeysentinel/ns3/named.conf.in
@@ -19,7 +19,6 @@ options {
        listen-on-v6 { none; };
        recursion yes;
        notify yes;
-       dnssec-enable yes;
        dnssec-validation yes;
        root-key-sentinel yes;
 };

diff --git a/bin/tests/system/rootkeysentinel/ns4/named.conf.in b/bin/tests/system/rootkeysentinel/ns4/named.conf.in
index 3a42b3f448c24a14ddfc9c6dfd38b54e424bd121..5c18751e735a5055f1312614a2a5770f0c13cc69 100644 (file)
--- a/bin/tests/system/rootkeysentinel/ns4/named.conf.in
+++ b/bin/tests/system/rootkeysentinel/ns4/named.conf.in
@@ -19,7 +19,6 @@ options {
        listen-on-v6 { none; };
        recursion yes;
        notify yes;
-       dnssec-enable yes;
        dnssec-validation yes;
        root-key-sentinel no;
 };

diff --git a/bin/tests/system/rsabigexponent/ns1/named.conf.in b/bin/tests/system/rsabigexponent/ns1/named.conf.in
index a43c02bc48525ddb33ae548480c3c88ddab3d7d7..95e7bd631218dae497daf5ee121086ddf602f727 100644 (file)
--- a/bin/tests/system/rsabigexponent/ns1/named.conf.in
+++ b/bin/tests/system/rsabigexponent/ns1/named.conf.in
@@ -21,7 +21,6 @@ options {
        listen-on-v6 { none; };
        recursion no;
        notify yes;
-       dnssec-enable yes;
        dnssec-validation yes;
 };
 

diff --git a/bin/tests/system/rsabigexponent/ns2/named.conf.in b/bin/tests/system/rsabigexponent/ns2/named.conf.in
index 2e8eb7aa91fae97d01ac51129b35c9eac3169e4c..b7963e50a71fa26045619f8f50dbf983f549663e 100644 (file)
--- a/bin/tests/system/rsabigexponent/ns2/named.conf.in
+++ b/bin/tests/system/rsabigexponent/ns2/named.conf.in
@@ -21,7 +21,6 @@ options {
        listen-on-v6 { none; };
        recursion no;
        notify yes;
-       dnssec-enable yes;
 };
 
 zone "." {

diff --git a/bin/tests/system/rsabigexponent/ns3/named.conf.in b/bin/tests/system/rsabigexponent/ns3/named.conf.in
index 99d2a0d3fc399c0bcd4cec572ca10f2dde6aed7c..34495937c4527aaf7abc597bf1e1da2c674af215 100644 (file)
--- a/bin/tests/system/rsabigexponent/ns3/named.conf.in
+++ b/bin/tests/system/rsabigexponent/ns3/named.conf.in
@@ -21,7 +21,6 @@ options {
        listen-on-v6 { none; };
        recursion yes;
        notify yes;
-       dnssec-enable yes;
        dnssec-validation yes;
        max-rsa-exponent-size 35;
 };

diff --git a/bin/tests/system/runtime/ns2/named-alt1.conf.in b/bin/tests/system/runtime/ns2/named-alt1.conf.in
index aab555fc2da15d8de88ed7dc1f3b7a5d9fbbcfee..bc0693e2b6aad20cd8b1618bc04c3008e572260b 100644 (file)
--- a/bin/tests/system/runtime/ns2/named-alt1.conf.in
+++ b/bin/tests/system/runtime/ns2/named-alt1.conf.in
@@ -19,6 +19,5 @@ options {
        listen-on-v6 { fd92:7065:b8e:ffff::2; };
        recursion no;
        notify yes;
-       dnssec-enable no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/runtime/ns2/named-alt2.conf.in b/bin/tests/system/runtime/ns2/named-alt2.conf.in
index a51338361653368433304ae8b41fd3016d59300b..fb8e40288f54ed4fb78cba51fa976c5543f44029 100644 (file)
--- a/bin/tests/system/runtime/ns2/named-alt2.conf.in
+++ b/bin/tests/system/runtime/ns2/named-alt2.conf.in
@@ -19,6 +19,5 @@ options {
        listen-on-v6 { fd92:7065:b8e:ffff::2; };
        recursion no;
        notify yes;
-       dnssec-enable no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/runtime/ns2/named-alt3.conf.in b/bin/tests/system/runtime/ns2/named-alt3.conf.in
index a1cf6145c162c9a9f2a27704967fee57385131a8..3cb5c09d6aaaab6db03c2c86bd84857f01fe7eff 100644 (file)
--- a/bin/tests/system/runtime/ns2/named-alt3.conf.in
+++ b/bin/tests/system/runtime/ns2/named-alt3.conf.in
@@ -20,6 +20,5 @@ options {
        listen-on-v6 { fd92:7065:b8e:ffff::2; };
        recursion no;
        notify yes;
-       dnssec-enable no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/runtime/ns2/named1.conf.in b/bin/tests/system/runtime/ns2/named1.conf.in
index 7eb7f6c615f9f4a2b65df4c174f3deda47b96936..5df31515f6d52f70b54acdd95ccfd653590d065c 100644 (file)
--- a/bin/tests/system/runtime/ns2/named1.conf.in
+++ b/bin/tests/system/runtime/ns2/named1.conf.in
@@ -19,7 +19,6 @@ options {
        listen-on-v6 { fd92:7065:b8e:ffff::2; };
        recursion no;
        notify yes;
-       dnssec-enable no;
        dnssec-validation no;
 };
 

diff --git a/bin/tests/system/sfcache/ns1/named.conf.in b/bin/tests/system/sfcache/ns1/named.conf.in
index a43c02bc48525ddb33ae548480c3c88ddab3d7d7..95e7bd631218dae497daf5ee121086ddf602f727 100644 (file)
--- a/bin/tests/system/sfcache/ns1/named.conf.in
+++ b/bin/tests/system/sfcache/ns1/named.conf.in
@@ -21,7 +21,6 @@ options {
        listen-on-v6 { none; };
        recursion no;
        notify yes;
-       dnssec-enable yes;
        dnssec-validation yes;
 };
 

diff --git a/bin/tests/system/sfcache/ns2/named.conf.in b/bin/tests/system/sfcache/ns2/named.conf.in
index 693ee05f6739f9b00e78c130518303eb8e284e12..12eabe39cf05f759d8dfa363bdec1feef6a6f831 100644 (file)
--- a/bin/tests/system/sfcache/ns2/named.conf.in
+++ b/bin/tests/system/sfcache/ns2/named.conf.in
@@ -21,7 +21,6 @@ options {
        listen-on-v6 { none; };
        recursion no;
        notify yes;
-       dnssec-enable yes;
        dnssec-validation yes;
 };
 

diff --git a/bin/tests/system/sfcache/ns5/named.conf.in b/bin/tests/system/sfcache/ns5/named.conf.in
index f5f0db76c88aa46a9e3052f1078d43e53410cf08..b601a5263691ccd04d120ed74af16555d641b987 100644 (file)
--- a/bin/tests/system/sfcache/ns5/named.conf.in
+++ b/bin/tests/system/sfcache/ns5/named.conf.in
@@ -20,7 +20,6 @@ options {
        listen-on { 10.53.0.5; };
        listen-on-v6 { none; };
        recursion yes;
-       dnssec-enable yes;
        dnssec-validation yes;
        servfail-ttl 30;
 };

diff --git a/bin/tests/system/synthfromdnssec/ns1/named.conf.in b/bin/tests/system/synthfromdnssec/ns1/named.conf.in
index 650cc30f08b444e0f88333b03fe2d3557948e097..cb0c0c372bb80144c7b695b5004e3a4ebda53e72 100644 (file)
--- a/bin/tests/system/synthfromdnssec/ns1/named.conf.in
+++ b/bin/tests/system/synthfromdnssec/ns1/named.conf.in
@@ -21,7 +21,6 @@ options {
        listen-on-v6 { none; };
        recursion no;
        notify yes;
-       dnssec-enable yes;
        dnssec-validation yes;
 };
 

diff --git a/bin/tests/system/synthfromdnssec/ns2/named.conf.in b/bin/tests/system/synthfromdnssec/ns2/named.conf.in
index 351b40eafd89fc787c12bc681a6b03eceffc192b..b130d305d33989284adffacba68f6761f57e6dca 100644 (file)
--- a/bin/tests/system/synthfromdnssec/ns2/named.conf.in
+++ b/bin/tests/system/synthfromdnssec/ns2/named.conf.in
@@ -21,7 +21,6 @@ options {
        listen-on-v6 { none; };
        recursion yes;
        notify no;
-       dnssec-enable yes;
        dnssec-validation yes;
 };
 

diff --git a/bin/tests/system/synthfromdnssec/ns3/named.conf.in b/bin/tests/system/synthfromdnssec/ns3/named.conf.in
index 8d7650628a72e1abfb53610506de027a6b95d750..5a8fbd671834dea6b9daed9d3411319edbaab9b8 100644 (file)
--- a/bin/tests/system/synthfromdnssec/ns3/named.conf.in
+++ b/bin/tests/system/synthfromdnssec/ns3/named.conf.in
@@ -21,7 +21,6 @@ options {
        listen-on-v6 { none; };
        recursion yes;
        notify no;
-       dnssec-enable yes;
        dnssec-validation yes;
 };
 

diff --git a/bin/tests/system/synthfromdnssec/ns4/named.conf.in b/bin/tests/system/synthfromdnssec/ns4/named.conf.in
index 9189e584938e9e9d198ce6e56abf2dfc7fa03ff2..042c6cf0b6290e4850d52622017581733cfa6d2b 100644 (file)
--- a/bin/tests/system/synthfromdnssec/ns4/named.conf.in
+++ b/bin/tests/system/synthfromdnssec/ns4/named.conf.in
@@ -21,7 +21,6 @@ options {
        listen-on-v6 { none; };
        recursion yes;
        notify no;
-       dnssec-enable yes;
        dnssec-validation yes;
        synth-from-dnssec no;
 };

diff --git a/bin/tests/system/synthfromdnssec/ns5/named.conf.in b/bin/tests/system/synthfromdnssec/ns5/named.conf.in
index 9cbf91c03f1e6a90f6e8385c20288e4859b8e1ce..90b83a643210b705955eb166d1d5e17367e37fef 100644 (file)
--- a/bin/tests/system/synthfromdnssec/ns5/named.conf.in
+++ b/bin/tests/system/synthfromdnssec/ns5/named.conf.in
@@ -21,7 +21,6 @@ options {
        listen-on-v6 { none; };
        recursion yes;
        notify no;
-       dnssec-enable yes;
        dnssec-validation yes;
        synth-from-dnssec yes;
 };

diff --git a/bin/tests/system/wildcard/ns1/named.conf.in b/bin/tests/system/wildcard/ns1/named.conf.in
index 3a54d275cdc9661c6f22dfc12eae8fd753201e64..092ae79fdeb31d55d7a0a2554f0f5d18124e8dea 100644 (file)
--- a/bin/tests/system/wildcard/ns1/named.conf.in
+++ b/bin/tests/system/wildcard/ns1/named.conf.in
@@ -20,7 +20,6 @@ options {
        recursion no;
        dnssec-validation no;
        notify yes;
-       dnssec-enable yes;
 };
 
 zone "." { type master; file "root.db.signed"; };

diff --git a/bin/tests/system/zonechecks/ns1/named.conf.in b/bin/tests/system/zonechecks/ns1/named.conf.in
index cd60ba32f2a922b87940573c08aadb955e699228..719535d786cf9f7c2de57f984da3c96c973d2526 100644 (file)
--- a/bin/tests/system/zonechecks/ns1/named.conf.in
+++ b/bin/tests/system/zonechecks/ns1/named.conf.in
@@ -21,7 +21,6 @@ options {
        listen-on-v6 { none; };
        recursion no;
        notify yes;
-       dnssec-enable yes;
        dnssec-validation yes;
 };
 

diff --git a/bin/tests/system/zonechecks/ns2/named.conf.in b/bin/tests/system/zonechecks/ns2/named.conf.in
index be847feaff4bd9570ef67a1c28ed571e5122def6..cd0f7ec24bacead61fe89fa72bc5f494f2b0a998 100644 (file)
--- a/bin/tests/system/zonechecks/ns2/named.conf.in
+++ b/bin/tests/system/zonechecks/ns2/named.conf.in
@@ -21,7 +21,6 @@ options {
        listen-on-v6 { none; };
        recursion no;
        notify yes;
-       dnssec-enable yes;
        dnssec-validation yes;
 };