Commit 885a3d20 authored by Evan Hunt's avatar Evan Hunt
Browse files

remove "dnssec-enable" from all system tests

parent b3ff3bf2
......@@ -21,7 +21,6 @@ options {
listen-on-v6 { none; };
recursion no;
notify yes;
dnssec-enable yes;
dnssec-validation yes;
};
......
......@@ -21,7 +21,6 @@ options {
listen-on-v6 { none; };
recursion no;
notify yes;
dnssec-enable yes;
dnssec-validation yes;
dnssec-loadkeys-interval 30;
};
......
......@@ -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;
......
......@@ -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;
};
......
......@@ -20,7 +20,6 @@ options {
listen-on { 10.53.0.5; };
listen-on-v6 { none; };
recursion yes;
dnssec-enable yes;
dnssec-validation yes;
};
......
......@@ -11,5 +11,4 @@
options {
dnssec-enable no;
dnssec-validation yes;
};
......@@ -9,10 +9,6 @@
* information regarding copyright ownership.
*/
options {
dnssec-enable no;
};
view view1 {
match-clients { any; };
dnssec-validation yes;
......
......@@ -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 {
......
......@@ -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`
......
......@@ -30,7 +30,6 @@ options {
listen-on-v6 { none; };
recursion no;
notify yes;
dnssec-enable yes;
dnssec-validation yes;
};
......
......@@ -30,7 +30,6 @@ options {
listen-on-v6 { none; };
recursion no;
notify yes;
dnssec-enable yes;
dnssec-validation yes;
};
......
......@@ -19,7 +19,6 @@ options {
listen-on-v6 { fd92:7065:b8e:ffff::1; };
recursion no;
notify yes;
dnssec-enable no;
dnssec-validation no;
};
......
......@@ -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;
};
......
......@@ -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";
};
......
......@@ -19,7 +19,6 @@ options {
listen-on-v6 { none; };
recursion no;
notify yes;
dnssec-enable yes;
};
zone "." { type master; file "root.signed"; };
......
......@@ -19,7 +19,6 @@ options {
listen-on-v6 { none; };
recursion no;
notify yes;
dnssec-enable yes;
};
zone "." { type hint; file "hints"; };
......
......@@ -19,7 +19,6 @@ options {
listen-on-v6 { none; };
recursion no;
notify yes;
dnssec-enable yes;
};
zone "." { type hint; file "hints"; };
......
......@@ -19,7 +19,6 @@ options {
listen-on-v6 { none; };
recursion no;
notify yes;
dnssec-enable no;
};
zone "." { type hint; file "hints"; };
......
......@@ -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";
};
......
......@@ -19,7 +19,6 @@ options {
listen-on-v6 { none; };
recursion no;
notify yes;
dnssec-enable yes;
};
zone "." { type hint; file "hints"; };
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment