remove "dnssec-enable" from all system tests

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;
 };
 

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;
 };

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;

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;
 };

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;
 };
 

bin/tests/system/checkconf/dnssec.1

@@ -11,5 +11,4 @@
 
 options {
 	dnssec-enable no;
-	dnssec-validation yes;
 };

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;

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 {

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`

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;
 };
 

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;
 };
 

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;
 };
 

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;
 };
 

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";
 };

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"; };

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"; };

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"; };

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"; };

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";
 };

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"; };