From: Nicki Křížek Date: Thu, 23 Jul 2026 16:45:40 +0000 (+0000) Subject: Drop options-level recursion yes statements X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=530a2ba04f8352f8f3a47e2850f5b05da9510cb2;p=thirdparty%2Fbind9.git Drop options-level recursion yes statements Recursion is on by default, so an options-level `recursion yes;` restates the default; view-level statements and `recursion no;` are untouched. Assisted-by: Claude:claude-fable-5 --- diff --git a/bin/tests/system/additional/ns3/named.conf.j2 b/bin/tests/system/additional/ns3/named.conf.j2 index a72765fa7a1..1b802bb2cf2 100644 --- a/bin/tests/system/additional/ns3/named.conf.j2 +++ b/bin/tests/system/additional/ns3/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; minimal-responses no; }; diff --git a/bin/tests/system/allow_query/ns3/named.conf.j2 b/bin/tests/system/allow_query/ns3/named.conf.j2 index de0a643695b..398cd6f8773 100644 --- a/bin/tests/system/allow_query/ns3/named.conf.j2 +++ b/bin/tests/system/allow_query/ns3/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; }; diff --git a/bin/tests/system/allow_query/ns3/named2.conf.j2 b/bin/tests/system/allow_query/ns3/named2.conf.j2 index 3b6a5446595..ad22b9c8135 100644 --- a/bin/tests/system/allow_query/ns3/named2.conf.j2 +++ b/bin/tests/system/allow_query/ns3/named2.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion yes; allow-recursion { any; }; allow-recursion-on { none; }; allow-query-cache-on { 10.53.0.3; }; diff --git a/bin/tests/system/allow_query/ns3/named3.conf.j2 b/bin/tests/system/allow_query/ns3/named3.conf.j2 index 8304bb98313..95ef6c72efb 100644 --- a/bin/tests/system/allow_query/ns3/named3.conf.j2 +++ b/bin/tests/system/allow_query/ns3/named3.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; 10.53.1.2; }; listen-on-v6 { none; }; - recursion yes; allow-recursion { any; }; allow-query-cache { any; }; allow-query-cache-on { 10.53.0.3; }; # allow-recursion-on inherits diff --git a/bin/tests/system/allow_query/ns3/named4.conf.j2 b/bin/tests/system/allow_query/ns3/named4.conf.j2 index 83c6102fbcf..a2c5e6f3eab 100644 --- a/bin/tests/system/allow_query/ns3/named4.conf.j2 +++ b/bin/tests/system/allow_query/ns3/named4.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; 10.53.1.2; }; listen-on-v6 { none; }; - recursion yes; allow-recursion { any; }; allow-query-cache { any; }; allow-recursion-on { 10.53.0.3; }; # allow-query-cache-on inherits diff --git a/bin/tests/system/auth/ns2/named.conf.j2 b/bin/tests/system/auth/ns2/named.conf.j2 index bb4233c4189..32331f0cfb9 100644 --- a/bin/tests/system/auth/ns2/named.conf.j2 +++ b/bin/tests/system/auth/ns2/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.2; }; listen-on-v6 { none; }; - recursion yes; notify no; dnssec-validation no; }; diff --git a/bin/tests/system/auth_res_deleg/ns2/named.conf.j2 b/bin/tests/system/auth_res_deleg/ns2/named.conf.j2 index e88d4bf86bd..46629ab8263 100644 --- a/bin/tests/system/auth_res_deleg/ns2/named.conf.j2 +++ b/bin/tests/system/auth_res_deleg/ns2/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.2; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; dnstap { resolver query; }; dnstap-output file "dnstap.out"; diff --git a/bin/tests/system/autosign/ns4/named.conf.j2 b/bin/tests/system/autosign/ns4/named.conf.j2 index bd0d44a1190..a427603ea0a 100644 --- a/bin/tests/system/autosign/ns4/named.conf.j2 +++ b/bin/tests/system/autosign/ns4/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.4; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation yes; }; diff --git a/bin/tests/system/autosign/ns5/named.conf.j2 b/bin/tests/system/autosign/ns5/named.conf.j2 index 35afb28c32f..48032d8dbb7 100644 --- a/bin/tests/system/autosign/ns5/named.conf.j2 +++ b/bin/tests/system/autosign/ns5/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.5; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation yes; }; diff --git a/bin/tests/system/bailiwick/ns4/named.conf.j2 b/bin/tests/system/bailiwick/ns4/named.conf.j2 index 4f4d200d968..fb5bd790764 100644 --- a/bin/tests/system/bailiwick/ns4/named.conf.j2 +++ b/bin/tests/system/bailiwick/ns4/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.4; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; qname-minimization off; }; diff --git a/bin/tests/system/builtin/ns1/named.conf.j2 b/bin/tests/system/builtin/ns1/named.conf.j2 index 1e8c4c85bf9..0586ddf6fd1 100644 --- a/bin/tests/system/builtin/ns1/named.conf.j2 +++ b/bin/tests/system/builtin/ns1/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.1; }; listen-on-v6 { none; }; - recursion yes; notify no; dnssec-validation no; }; diff --git a/bin/tests/system/builtin/ns2/named.conf.j2 b/bin/tests/system/builtin/ns2/named.conf.j2 index 249358784ec..d4dd416d32e 100644 --- a/bin/tests/system/builtin/ns2/named.conf.j2 +++ b/bin/tests/system/builtin/ns2/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.2; }; listen-on-v6 { none; }; - recursion yes; notify no; server-id hostname; dnssec-validation no; diff --git a/bin/tests/system/builtin/ns3/named.conf.j2 b/bin/tests/system/builtin/ns3/named.conf.j2 index 04bdae9c47f..58a512a9ff1 100644 --- a/bin/tests/system/builtin/ns3/named.conf.j2 +++ b/bin/tests/system/builtin/ns3/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion yes; notify no; hostname "this.is.a.test.of.hostname"; server-id "this.is.a.test.of.server-id"; diff --git a/bin/tests/system/cache_delegns/ns2/named.conf.j2 b/bin/tests/system/cache_delegns/ns2/named.conf.j2 index 8f5bea44ba5..efaf19c9abc 100644 --- a/bin/tests/system/cache_delegns/ns2/named.conf.j2 +++ b/bin/tests/system/cache_delegns/ns2/named.conf.j2 @@ -25,7 +25,6 @@ options { port @PORT@; pid-file "named.pid"; - recursion yes; dnssec-validation no; {% if dns64 %} diff --git a/bin/tests/system/cacheclean/ns2/named.conf.j2 b/bin/tests/system/cacheclean/ns2/named.conf.j2 index 827bb20bf5e..802dcf6f55f 100644 --- a/bin/tests/system/cacheclean/ns2/named.conf.j2 +++ b/bin/tests/system/cacheclean/ns2/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; disable-empty-zone 127.IN-ADDR.ARPA; - recursion yes; dnssec-validation no; // lame-and-expire-soon domain NS has a TTL of 2 seconds, diff --git a/bin/tests/system/camp/ns3/named.conf.j2 b/bin/tests/system/camp/ns3/named.conf.j2 index c255ca9af8b..5359e991a7c 100644 --- a/bin/tests/system/camp/ns3/named.conf.j2 +++ b/bin/tests/system/camp/ns3/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; max-query-count 150; diff --git a/bin/tests/system/camp/ns9/named.conf.j2 b/bin/tests/system/camp/ns9/named.conf.j2 index 5fc254a6e00..c17f25f2ead 100644 --- a/bin/tests/system/camp/ns9/named.conf.j2 +++ b/bin/tests/system/camp/ns9/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.9; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; max-recursion-queries 50; diff --git a/bin/tests/system/cap_glues/ns3/named.conf.j2 b/bin/tests/system/cap_glues/ns3/named.conf.j2 index 3ccb80b195b..f677533bf23 100644 --- a/bin/tests/system/cap_glues/ns3/named.conf.j2 +++ b/bin/tests/system/cap_glues/ns3/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; }; diff --git a/bin/tests/system/cdnxdomain/ns1/named.conf.j2 b/bin/tests/system/cdnxdomain/ns1/named.conf.j2 index 64f316253f4..c00acaedbbd 100644 --- a/bin/tests/system/cdnxdomain/ns1/named.conf.j2 +++ b/bin/tests/system/cdnxdomain/ns1/named.conf.j2 @@ -10,7 +10,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.1; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation yes; servfail-ttl 0; }; diff --git a/bin/tests/system/chain/ns7/named.conf.j2 b/bin/tests/system/chain/ns7/named.conf.j2 index b884c0536f2..35d274f25d3 100644 --- a/bin/tests/system/chain/ns7/named.conf.j2 +++ b/bin/tests/system/chain/ns7/named.conf.j2 @@ -9,7 +9,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.7; }; listen-on-v6 { fd92:7065:b8e:ffff::7; }; - recursion yes; allow-recursion { any; }; dnssec-validation no; deny-answer-aliases { diff --git a/bin/tests/system/chase_ds/ns3/named.conf.j2 b/bin/tests/system/chase_ds/ns3/named.conf.j2 index 90af32b9cac..7faf9669c2d 100644 --- a/bin/tests/system/chase_ds/ns3/named.conf.j2 +++ b/bin/tests/system/chase_ds/ns3/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation yes; }; diff --git a/bin/tests/system/checkds/ns3/named.conf.j2 b/bin/tests/system/checkds/ns3/named.conf.j2 index 504aea1fd5a..53ea6e909de 100644 --- a/bin/tests/system/checkds/ns3/named.conf.j2 +++ b/bin/tests/system/checkds/ns3/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation yes; session-keyfile "session.key"; }; diff --git a/bin/tests/system/checknames/ns2/named.conf.j2 b/bin/tests/system/checknames/ns2/named.conf.j2 index 1cf12dba38f..12762ee1661 100644 --- a/bin/tests/system/checknames/ns2/named.conf.j2 +++ b/bin/tests/system/checknames/ns2/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.2; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; check-names response warn; }; diff --git a/bin/tests/system/checknames/ns3/named.conf.j2 b/bin/tests/system/checknames/ns3/named.conf.j2 index 4d214bff00a..35069dc33ee 100644 --- a/bin/tests/system/checknames/ns3/named.conf.j2 +++ b/bin/tests/system/checknames/ns3/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; check-names response fail; }; diff --git a/bin/tests/system/checknames/ns4/named.conf.j2 b/bin/tests/system/checknames/ns4/named.conf.j2 index f14d011c77e..3590f8cb2a2 100644 --- a/bin/tests/system/checknames/ns4/named.conf.j2 +++ b/bin/tests/system/checknames/ns4/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.4; }; listen-on-v6 { none; }; allow-transfer { any; }; - recursion yes; dnssec-validation no; check-names primary ignore; check-names secondary ignore; diff --git a/bin/tests/system/checknames/ns5/named.conf.j2 b/bin/tests/system/checknames/ns5/named.conf.j2 index 8cb67b99722..5637b9d13f4 100644 --- a/bin/tests/system/checknames/ns5/named.conf.j2 +++ b/bin/tests/system/checknames/ns5/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.5; }; listen-on-v6 { none; }; allow-transfer { any; }; - recursion yes; dnssec-validation no; check-names master ignore; check-names slave ignore; diff --git a/bin/tests/system/cookie/ns1/named.conf.j2 b/bin/tests/system/cookie/ns1/named.conf.j2 index b11e8e03241..23bc6ee3b2e 100644 --- a/bin/tests/system/cookie/ns1/named.conf.j2 +++ b/bin/tests/system/cookie/ns1/named.conf.j2 @@ -17,7 +17,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.1; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; deny-answer-addresses { 192.0.2.0/24; 2001:db8:beef::/48; } except-from { "example.org"; }; diff --git a/bin/tests/system/cookie/ns3/named.conf.j2 b/bin/tests/system/cookie/ns3/named.conf.j2 index 8ad600762c7..f28cc39a73e 100644 --- a/bin/tests/system/cookie/ns3/named.conf.j2 +++ b/bin/tests/system/cookie/ns3/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; deny-answer-addresses { 192.0.2.0/24; 2001:db8:beef::/48; } except-from { "example.org"; }; diff --git a/bin/tests/system/cookie/ns4/named.conf.j2 b/bin/tests/system/cookie/ns4/named.conf.j2 index a08c6371dc0..de7897db012 100644 --- a/bin/tests/system/cookie/ns4/named.conf.j2 +++ b/bin/tests/system/cookie/ns4/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.4; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; cookie-algorithm siphash24; cookie-secret "569d36a6cc27d6bf55502183302ba352"; diff --git a/bin/tests/system/cookie/ns5/named.conf.j2 b/bin/tests/system/cookie/ns5/named.conf.j2 index 1ca3a38b0c9..beb84886c27 100644 --- a/bin/tests/system/cookie/ns5/named.conf.j2 +++ b/bin/tests/system/cookie/ns5/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.5; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; cookie-algorithm siphash24; cookie-secret "569d36a6cc27d6bf55502183302ba352"; diff --git a/bin/tests/system/cookie/ns6/named.conf.j2 b/bin/tests/system/cookie/ns6/named.conf.j2 index 0192fe1cdc9..2e81e57847a 100644 --- a/bin/tests/system/cookie/ns6/named.conf.j2 +++ b/bin/tests/system/cookie/ns6/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.6; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; cookie-algorithm siphash24; cookie-secret "6b300e27a0db46d4b046e4189790fa7d"; diff --git a/bin/tests/system/cyclic_glue/ns4/named.conf.j2 b/bin/tests/system/cyclic_glue/ns4/named.conf.j2 index 8566d2afbca..ea8cb38ee49 100644 --- a/bin/tests/system/cyclic_glue/ns4/named.conf.j2 +++ b/bin/tests/system/cyclic_glue/ns4/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.4; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; }; diff --git a/bin/tests/system/delegation_ttl/ns2/named.conf.j2 b/bin/tests/system/delegation_ttl/ns2/named.conf.j2 index e0e6ec90efd..e80bbda1c67 100644 --- a/bin/tests/system/delegation_ttl/ns2/named.conf.j2 +++ b/bin/tests/system/delegation_ttl/ns2/named.conf.j2 @@ -9,7 +9,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.2; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; {% if minttl != None %} min-delegation-ttl @minttl@; diff --git a/bin/tests/system/digdelv/ns3/named.conf.j2 b/bin/tests/system/digdelv/ns3/named.conf.j2 index aade9232f9b..a91b67b8e3b 100644 --- a/bin/tests/system/digdelv/ns3/named.conf.j2 +++ b/bin/tests/system/digdelv/ns3/named.conf.j2 @@ -9,7 +9,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { fd92:7065:b8e:ffff::3; }; - recursion yes; dnssec-validation no; server-id "ns3"; minimal-any no; diff --git a/bin/tests/system/dispatch/ns2/named.conf.j2 b/bin/tests/system/dispatch/ns2/named.conf.j2 index 4c5244b86a9..f183e403654 100644 --- a/bin/tests/system/dispatch/ns2/named.conf.j2 +++ b/bin/tests/system/dispatch/ns2/named.conf.j2 @@ -14,7 +14,6 @@ options { notify-source-v6 fd92:7065:b8e:ffff::2; transfer-source-v6 fd92:7065:b8e:ffff::2; - recursion yes; servfail-ttl 0; dnssec-validation no; }; diff --git a/bin/tests/system/dns64/ns2/named.conf.j2 b/bin/tests/system/dns64/ns2/named.conf.j2 index 791a15b0924..e93c480af9a 100644 --- a/bin/tests/system/dns64/ns2/named.conf.j2 +++ b/bin/tests/system/dns64/ns2/named.conf.j2 @@ -10,7 +10,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.2; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; dns64 2001:aaaa::/96 { diff --git a/bin/tests/system/dns64_dname/ns2/named.conf.j2 b/bin/tests/system/dns64_dname/ns2/named.conf.j2 index b33bda42801..6939e53d7d9 100644 --- a/bin/tests/system/dns64_dname/ns2/named.conf.j2 +++ b/bin/tests/system/dns64_dname/ns2/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.2; }; listen-on-v6 { none; }; - recursion yes; allow-recursion { any; }; dnssec-validation no; qname-minimization off; diff --git a/bin/tests/system/dnssec/ns4/named.conf.j2 b/bin/tests/system/dnssec/ns4/named.conf.j2 index d72dc52bf16..da418cd0b03 100644 --- a/bin/tests/system/dnssec/ns4/named.conf.j2 +++ b/bin/tests/system/dnssec/ns4/named.conf.j2 @@ -15,7 +15,6 @@ options { listen-on-v6 { none; }; minimal-any no; minimal-responses no; - recursion yes; {% if accept_expired %} dnssec-accept-expired yes; diff --git a/bin/tests/system/dnssec/ns5/named.conf.j2 b/bin/tests/system/dnssec/ns5/named.conf.j2 index bc128cc6a74..381de6707e8 100644 --- a/bin/tests/system/dnssec/ns5/named.conf.j2 +++ b/bin/tests/system/dnssec/ns5/named.conf.j2 @@ -12,7 +12,6 @@ options { listen-on { 10.53.0.5; 127.0.0.1; }; listen-on-v6 { none; }; minimal-any no; - recursion yes; minimal-responses no; servfail-ttl 0; diff --git a/bin/tests/system/dnssec/ns6/named.conf.j2 b/bin/tests/system/dnssec/ns6/named.conf.j2 index d5fe26700a8..1622479efb9 100644 --- a/bin/tests/system/dnssec/ns6/named.conf.j2 +++ b/bin/tests/system/dnssec/ns6/named.conf.j2 @@ -9,7 +9,6 @@ options { listen-on { 10.53.0.6; }; listen-on-v6 { none; }; minimal-any no; - recursion yes; disable-algorithms . { @ALTERNATIVE_ALGORITHM@; }; dnssec-validation yes; }; diff --git a/bin/tests/system/dnssec/ns9/named.conf.j2 b/bin/tests/system/dnssec/ns9/named.conf.j2 index 5ba53ae1975..32b2c430189 100644 --- a/bin/tests/system/dnssec/ns9/named.conf.j2 +++ b/bin/tests/system/dnssec/ns9/named.conf.j2 @@ -11,7 +11,6 @@ options { listen-on { 10.53.0.9; }; listen-on-v6 { none; }; minimal-any no; - recursion yes; dnssec-validation yes; forward only; {% if forward_badkey %} diff --git a/bin/tests/system/dnssec_bypass/ns4/named.conf.j2 b/bin/tests/system/dnssec_bypass/ns4/named.conf.j2 index 065dcf1ce41..83e737e2fe3 100644 --- a/bin/tests/system/dnssec_bypass/ns4/named.conf.j2 +++ b/bin/tests/system/dnssec_bypass/ns4/named.conf.j2 @@ -20,7 +20,6 @@ options { listen-on { 10.53.0.4; }; listen-on-v6 { none; }; allow-transfer { any; }; - recursion yes; dnssec-validation yes; synth-from-dnssec yes; }; diff --git a/bin/tests/system/dnssec_cname_response/ns3/named.conf.j2 b/bin/tests/system/dnssec_cname_response/ns3/named.conf.j2 index 786530ca352..dde039ac238 100644 --- a/bin/tests/system/dnssec_cname_response/ns3/named.conf.j2 +++ b/bin/tests/system/dnssec_cname_response/ns3/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; allow-transfer { any; }; dnssec-validation yes; - recursion yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/dnssec_nsec3/ns2/named.conf.j2 b/bin/tests/system/dnssec_nsec3/ns2/named.conf.j2 index 91c475783a9..adb07d812f5 100644 --- a/bin/tests/system/dnssec_nsec3/ns2/named.conf.j2 +++ b/bin/tests/system/dnssec_nsec3/ns2/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.2; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation yes; minimal-responses no; qname-minimization off; diff --git a/bin/tests/system/dnssec_parent_rrsig/ns2/named.conf.j2 b/bin/tests/system/dnssec_parent_rrsig/ns2/named.conf.j2 index 69a1864b5e3..03420a88013 100644 --- a/bin/tests/system/dnssec_parent_rrsig/ns2/named.conf.j2 +++ b/bin/tests/system/dnssec_parent_rrsig/ns2/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.2; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation yes; trust-anchor-telemetry no; resolver-query-timeout 5000; diff --git a/bin/tests/system/dnssec_py/ns9/named.conf.j2 b/bin/tests/system/dnssec_py/ns9/named.conf.j2 index 9e011bf6e50..5ceaee01d06 100644 --- a/bin/tests/system/dnssec_py/ns9/named.conf.j2 +++ b/bin/tests/system/dnssec_py/ns9/named.conf.j2 @@ -11,7 +11,6 @@ options { listen-on { @ns.ip@; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation yes; diff --git a/bin/tests/system/dnssec_wildcard/ns2/named.conf.j2 b/bin/tests/system/dnssec_wildcard/ns2/named.conf.j2 index f7985c92dca..f0d908eb5b9 100644 --- a/bin/tests/system/dnssec_wildcard/ns2/named.conf.j2 +++ b/bin/tests/system/dnssec_wildcard/ns2/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.2; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation yes; minimal-responses no; }; diff --git a/bin/tests/system/dnstap/ns2/named.conf.j2 b/bin/tests/system/dnstap/ns2/named.conf.j2 index edf9c9d381a..a4a7e47cf28 100644 --- a/bin/tests/system/dnstap/ns2/named.conf.j2 +++ b/bin/tests/system/dnstap/ns2/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.2; }; listen-on-v6 { none; }; - recursion yes; statistics-file "named.stats"; dnstap-identity "ns2"; dnstap-version "xxx"; diff --git a/bin/tests/system/dnstap/ns3/named.conf.j2 b/bin/tests/system/dnstap/ns3/named.conf.j2 index b6d4341a27c..1c5d0f68ece 100644 --- a/bin/tests/system/dnstap/ns3/named.conf.j2 +++ b/bin/tests/system/dnstap/ns3/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion yes; dnstap-identity "ns3"; dnstap-version "xxx"; dnstap-output file "dnstap.out"; diff --git a/bin/tests/system/dnstap/ns4/named.conf.j2 b/bin/tests/system/dnstap/ns4/named.conf.j2 index 686b0f992df..4526cf63414 100644 --- a/bin/tests/system/dnstap/ns4/named.conf.j2 +++ b/bin/tests/system/dnstap/ns4/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.4; }; listen-on-v6 { none; }; - recursion yes; dnstap-identity "ns4"; dnstap-version "xxx"; dnstap-output unix "dnstap.out"; diff --git a/bin/tests/system/dnstap/ns5/named.conf.j2 b/bin/tests/system/dnstap/ns5/named.conf.j2 index 823df5d8fd5..6d94640eae2 100644 --- a/bin/tests/system/dnstap/ns5/named.conf.j2 +++ b/bin/tests/system/dnstap/ns5/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.5; }; listen-on-v6 { none; }; - recursion yes; dnstap-identity "ns5"; dnstap-version "xxx"; dnstap-output file "dnstap.out"; diff --git a/bin/tests/system/doth/ns2/named.conf.j2 b/bin/tests/system/doth/ns2/named.conf.j2 index ae213f63eae..999897d94b5 100644 --- a/bin/tests/system/doth/ns2/named.conf.j2 +++ b/bin/tests/system/doth/ns2/named.conf.j2 @@ -27,7 +27,6 @@ options { listen-on tls none http local { 10.53.0.2; }; // unencrypted DoH listen-on-v6 tls none http local { fd92:7065:b8e:ffff::2; }; listen-on-v6 { none; }; - recursion yes; allow-recursion { any; }; allow-query-cache { any; }; allow-recursion-on { 10.53.0.2; }; # allow-query-cache-on inherits; diff --git a/bin/tests/system/dsdigest/ns3/named.conf.j2 b/bin/tests/system/dsdigest/ns3/named.conf.j2 index 6164730bd30..22102ae93dc 100644 --- a/bin/tests/system/dsdigest/ns3/named.conf.j2 +++ b/bin/tests/system/dsdigest/ns3/named.conf.j2 @@ -10,7 +10,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion 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/dsdigest/ns4/named.conf.j2 b/bin/tests/system/dsdigest/ns4/named.conf.j2 index a20573f91cc..d9bd797d7ef 100644 --- a/bin/tests/system/dsdigest/ns4/named.conf.j2 +++ b/bin/tests/system/dsdigest/ns4/named.conf.j2 @@ -10,7 +10,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.4; }; listen-on-v6 { none; }; - recursion 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/ns2/named.conf.j2 b/bin/tests/system/ecdsa/ns2/named.conf.j2 index 08b2479fca0..761aa900db8 100644 --- a/bin/tests/system/ecdsa/ns2/named.conf.j2 +++ b/bin/tests/system/ecdsa/ns2/named.conf.j2 @@ -10,7 +10,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.2; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation yes; }; diff --git a/bin/tests/system/ecdsa/ns3/named.conf.j2 b/bin/tests/system/ecdsa/ns3/named.conf.j2 index c65d9b276ca..403eb4aac4d 100644 --- a/bin/tests/system/ecdsa/ns3/named.conf.j2 +++ b/bin/tests/system/ecdsa/ns3/named.conf.j2 @@ -10,7 +10,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation yes; }; diff --git a/bin/tests/system/eddsa/ns2/named.conf.j2 b/bin/tests/system/eddsa/ns2/named.conf.j2 index 08b2479fca0..761aa900db8 100644 --- a/bin/tests/system/eddsa/ns2/named.conf.j2 +++ b/bin/tests/system/eddsa/ns2/named.conf.j2 @@ -10,7 +10,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.2; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation yes; }; diff --git a/bin/tests/system/eddsa/ns3/named.conf.j2 b/bin/tests/system/eddsa/ns3/named.conf.j2 index c65d9b276ca..403eb4aac4d 100644 --- a/bin/tests/system/eddsa/ns3/named.conf.j2 +++ b/bin/tests/system/eddsa/ns3/named.conf.j2 @@ -10,7 +10,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation yes; }; diff --git a/bin/tests/system/emptyzones/ns1/named.conf.j2 b/bin/tests/system/emptyzones/ns1/named.conf.j2 index ec38a9f55d5..3c358ddc7f6 100644 --- a/bin/tests/system/emptyzones/ns1/named.conf.j2 +++ b/bin/tests/system/emptyzones/ns1/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.1; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; deny-answer-addresses { 192.0.2.0/24; 2001:db8:beef::/48; } except-from { "example.org"; }; diff --git a/bin/tests/system/expiredglue/ns4/named.conf.j2 b/bin/tests/system/expiredglue/ns4/named.conf.j2 index 8cadbee4b02..ba3847fca1d 100644 --- a/bin/tests/system/expiredglue/ns4/named.conf.j2 +++ b/bin/tests/system/expiredglue/ns4/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.4; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; }; diff --git a/bin/tests/system/fetchlimit/ns3/named.conf.j2 b/bin/tests/system/fetchlimit/ns3/named.conf.j2 index 7caef38eb5e..36dc9af7449 100644 --- a/bin/tests/system/fetchlimit/ns3/named.conf.j2 +++ b/bin/tests/system/fetchlimit/ns3/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; fetches-per-server 400; }; diff --git a/bin/tests/system/fetchlimit/ns3/named2.conf.j2 b/bin/tests/system/fetchlimit/ns3/named2.conf.j2 index c0d00b34424..a81b834b3d0 100644 --- a/bin/tests/system/fetchlimit/ns3/named2.conf.j2 +++ b/bin/tests/system/fetchlimit/ns3/named2.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; fetches-per-zone 40; }; diff --git a/bin/tests/system/fetchlimit/ns3/named3.conf.j2 b/bin/tests/system/fetchlimit/ns3/named3.conf.j2 index 286f3f3ac3f..76e87e31c7f 100644 --- a/bin/tests/system/fetchlimit/ns3/named3.conf.j2 +++ b/bin/tests/system/fetchlimit/ns3/named3.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; recursive-clients 400; }; diff --git a/bin/tests/system/fetchlimit/ns5/named.conf.j2 b/bin/tests/system/fetchlimit/ns5/named.conf.j2 index db52f6059c2..dab43bdf2a6 100644 --- a/bin/tests/system/fetchlimit/ns5/named.conf.j2 +++ b/bin/tests/system/fetchlimit/ns5/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.5; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; clients-per-query 5; max-clients-per-query 10; diff --git a/bin/tests/system/fetchlimit/ns5/named2.conf.j2 b/bin/tests/system/fetchlimit/ns5/named2.conf.j2 index e82e049ba66..8127018695c 100644 --- a/bin/tests/system/fetchlimit/ns5/named2.conf.j2 +++ b/bin/tests/system/fetchlimit/ns5/named2.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.5; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; stale-answer-enable yes; stale-cache-enable yes; diff --git a/bin/tests/system/fetchlimit/ns5/named3.conf.j2 b/bin/tests/system/fetchlimit/ns5/named3.conf.j2 index 255014b49f8..855befe3f96 100644 --- a/bin/tests/system/fetchlimit/ns5/named3.conf.j2 +++ b/bin/tests/system/fetchlimit/ns5/named3.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.5; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; stale-answer-enable yes; stale-cache-enable yes; diff --git a/bin/tests/system/filters/ns2/named.conf.j2 b/bin/tests/system/filters/ns2/named.conf.j2 index c7dcb992001..0a49beb2f98 100644 --- a/bin/tests/system/filters/ns2/named.conf.j2 +++ b/bin/tests/system/filters/ns2/named.conf.j2 @@ -12,7 +12,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.2; }; listen-on-v6 { fd92:7065:b8e:ffff::2; }; - recursion yes; dnssec-validation yes; minimal-responses no; }; diff --git a/bin/tests/system/filters/ns3/named.conf.j2 b/bin/tests/system/filters/ns3/named.conf.j2 index ebfd5e7e8d1..1c8b245d203 100644 --- a/bin/tests/system/filters/ns3/named.conf.j2 +++ b/bin/tests/system/filters/ns3/named.conf.j2 @@ -12,7 +12,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { fd92:7065:b8e:ffff::3; }; - recursion yes; dnssec-validation yes; minimal-responses no; }; diff --git a/bin/tests/system/filters/ns5/named.conf.j2 b/bin/tests/system/filters/ns5/named.conf.j2 index 1c9cfeb8834..2b18146fb43 100644 --- a/bin/tests/system/filters/ns5/named.conf.j2 +++ b/bin/tests/system/filters/ns5/named.conf.j2 @@ -9,7 +9,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.5; }; listen-on-v6 { fd92:7065:b8e:ffff::5; }; - recursion yes; dnssec-validation no; dns64 64:ff9b::/96 { clients { any; }; diff --git a/bin/tests/system/forward/ns4/named.conf.j2 b/bin/tests/system/forward/ns4/named.conf.j2 index 5854c30999a..a333a15772b 100644 --- a/bin/tests/system/forward/ns4/named.conf.j2 +++ b/bin/tests/system/forward/ns4/named.conf.j2 @@ -10,7 +10,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.4; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; minimal-responses yes; diff --git a/bin/tests/system/fwdfirst/ns4/named.conf.j2 b/bin/tests/system/fwdfirst/ns4/named.conf.j2 index 6d5d29f7705..930b9332e0c 100644 --- a/bin/tests/system/fwdfirst/ns4/named.conf.j2 +++ b/bin/tests/system/fwdfirst/ns4/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.4; }; listen-on-v6 { none; }; - recursion yes; allow-query { any; }; allow-recursion { any; }; dnssec-validation no; diff --git a/bin/tests/system/fwdfirst/ns5/named.conf.j2 b/bin/tests/system/fwdfirst/ns5/named.conf.j2 index cf3f5e9ec41..50f5057e22a 100644 --- a/bin/tests/system/fwdfirst/ns5/named.conf.j2 +++ b/bin/tests/system/fwdfirst/ns5/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.5; }; listen-on-v6 { none; }; - recursion yes; allow-query { any; }; allow-recursion { any; }; dnssec-validation no; diff --git a/bin/tests/system/glue/ns1/named.conf.j2 b/bin/tests/system/glue/ns1/named.conf.j2 index 684150bfe19..e20991b82ad 100644 --- a/bin/tests/system/glue/ns1/named.conf.j2 +++ b/bin/tests/system/glue/ns1/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.1; }; listen-on-v6 { none; }; - recursion yes; notify no; dnssec-validation no; }; diff --git a/bin/tests/system/inline/ns6/named.conf.j2 b/bin/tests/system/inline/ns6/named.conf.j2 index 4541b170eda..8a37c83c146 100644 --- a/bin/tests/system/inline/ns6/named.conf.j2 +++ b/bin/tests/system/inline/ns6/named.conf.j2 @@ -10,7 +10,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.6; }; listen-on-v6 { none; }; - recursion yes; notify-delay 0; dnssec-validation yes; }; diff --git a/bin/tests/system/keepalive/ns2/named.conf.j2 b/bin/tests/system/keepalive/ns2/named.conf.j2 index 312a7e6bb98..1d6ef54ec48 100644 --- a/bin/tests/system/keepalive/ns2/named.conf.j2 +++ b/bin/tests/system/keepalive/ns2/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.2; }; listen-on-v6 { none; }; - recursion yes; send-cookie yes; tcp-advertised-timeout 150; dnssec-validation no; diff --git a/bin/tests/system/keepalive/ns3/named.conf.j2 b/bin/tests/system/keepalive/ns3/named.conf.j2 index 9048c38ea21..a233dd247d0 100644 --- a/bin/tests/system/keepalive/ns3/named.conf.j2 +++ b/bin/tests/system/keepalive/ns3/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; }; diff --git a/bin/tests/system/legacy/ns1/named.conf.j2 b/bin/tests/system/legacy/ns1/named.conf.j2 index 047939d50d4..418801fda6e 100644 --- a/bin/tests/system/legacy/ns1/named.conf.j2 +++ b/bin/tests/system/legacy/ns1/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.1; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation @dnssec_validation@; }; diff --git a/bin/tests/system/minimalresponses/ns3/named.conf.j2 b/bin/tests/system/minimalresponses/ns3/named.conf.j2 index 08d92b123c1..fab85796083 100644 --- a/bin/tests/system/minimalresponses/ns3/named.conf.j2 +++ b/bin/tests/system/minimalresponses/ns3/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; minimal-responses @minresp@; }; diff --git a/bin/tests/system/minimalresponses/ns4/named.conf.j2 b/bin/tests/system/minimalresponses/ns4/named.conf.j2 index a7565018fe5..4dfba0ce5f0 100644 --- a/bin/tests/system/minimalresponses/ns4/named.conf.j2 +++ b/bin/tests/system/minimalresponses/ns4/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.4; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; minimal-responses @minresp@; }; diff --git a/bin/tests/system/mirror/ns3/named.conf.j2 b/bin/tests/system/mirror/ns3/named.conf.j2 index 856ff159c74..c45d1904f3c 100644 --- a/bin/tests/system/mirror/ns3/named.conf.j2 +++ b/bin/tests/system/mirror/ns3/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion yes; allow-query-cache { 10.53.0.1; }; trust-anchor-telemetry yes; allow-new-zones yes; diff --git a/bin/tests/system/mismatchtcp/ns1/named.conf.j2 b/bin/tests/system/mismatchtcp/ns1/named.conf.j2 index b00da90ca4d..6c4f912f4d3 100644 --- a/bin/tests/system/mismatchtcp/ns1/named.conf.j2 +++ b/bin/tests/system/mismatchtcp/ns1/named.conf.j2 @@ -21,7 +21,6 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; query-source address 10.53.0.1; - recursion yes; dnssec-validation no; }; diff --git a/bin/tests/system/mkeys/ns2/named.conf.j2 b/bin/tests/system/mkeys/ns2/named.conf.j2 index 49094ff4c01..01b3c0501a7 100644 --- a/bin/tests/system/mkeys/ns2/named.conf.j2 +++ b/bin/tests/system/mkeys/ns2/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.2; }; listen-on-v6 { none; }; - recursion yes; notify no; dnssec-validation auto; servfail-ttl 0; diff --git a/bin/tests/system/mkeys/ns3/named.conf.j2 b/bin/tests/system/mkeys/ns3/named.conf.j2 index 5792db204c4..1e62a70f8c1 100644 --- a/bin/tests/system/mkeys/ns3/named.conf.j2 +++ b/bin/tests/system/mkeys/ns3/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion yes; notify no; dnssec-validation auto; trust-anchor-telemetry no; diff --git a/bin/tests/system/mkeys/ns4/named.conf.j2 b/bin/tests/system/mkeys/ns4/named.conf.j2 index 0ca44cca501..cc0673ec2cd 100644 --- a/bin/tests/system/mkeys/ns4/named.conf.j2 +++ b/bin/tests/system/mkeys/ns4/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.4; }; listen-on-v6 { none; }; - recursion yes; notify no; dnssec-validation auto; managed-keys-directory "nope"; diff --git a/bin/tests/system/mkeys/ns5/named.conf.j2 b/bin/tests/system/mkeys/ns5/named.conf.j2 index 6795dc2686d..05d65e2d644 100644 --- a/bin/tests/system/mkeys/ns5/named.conf.j2 +++ b/bin/tests/system/mkeys/ns5/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.5; }; listen-on-v6 { none; }; - recursion yes; notify no; dnssec-validation auto; servfail-ttl 0; diff --git a/bin/tests/system/mkeys/ns6/named.conf.j2 b/bin/tests/system/mkeys/ns6/named.conf.j2 index b8b99665fa6..d55054a84e9 100644 --- a/bin/tests/system/mkeys/ns6/named.conf.j2 +++ b/bin/tests/system/mkeys/ns6/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.6; }; listen-on-v6 { none; }; - recursion yes; notify no; dnssec-validation auto; trust-anchor-telemetry no; diff --git a/bin/tests/system/mkeys/ns7/named.conf.j2 b/bin/tests/system/mkeys/ns7/named.conf.j2 index e17d5ea732f..f7c2486dc3b 100644 --- a/bin/tests/system/mkeys/ns7/named.conf.j2 +++ b/bin/tests/system/mkeys/ns7/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.7; }; listen-on-v6 { none; }; - recursion yes; notify no; dnssec-validation auto; }; diff --git a/bin/tests/system/notify/ns3/named.conf.j2 b/bin/tests/system/notify/ns3/named.conf.j2 index 024c64a61ca..05a76d6162f 100644 --- a/bin/tests/system/notify/ns3/named.conf.j2 +++ b/bin/tests/system/notify/ns3/named.conf.j2 @@ -13,7 +13,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { fd92:7065:b8e:ffff::3; }; - recursion yes; dnssec-validation no; tcp-initial-timeout 150; # 15 seconds diff --git a/bin/tests/system/notify/ns4/named.conf.j2 b/bin/tests/system/notify/ns4/named.conf.j2 index 741b28acc62..cdfb06c77fb 100644 --- a/bin/tests/system/notify/ns4/named.conf.j2 +++ b/bin/tests/system/notify/ns4/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.4; }; listen-on-v6 { none; }; allow-transfer { any; }; - recursion yes; dnssec-validation no; }; diff --git a/bin/tests/system/notify/ns5/named.conf.j2 b/bin/tests/system/notify/ns5/named.conf.j2 index b157da6237e..bfc2609cbfd 100644 --- a/bin/tests/system/notify/ns5/named.conf.j2 +++ b/bin/tests/system/notify/ns5/named.conf.j2 @@ -22,7 +22,6 @@ options { listen-on { 10.53.0.5; }; listen-on-v6 { none; }; allow-transfer { any; }; - recursion yes; dnssec-validation no; }; diff --git a/bin/tests/system/nsec/ns3/named.conf.j2 b/bin/tests/system/nsec/ns3/named.conf.j2 index d07e16e1d9e..b4d71749323 100644 --- a/bin/tests/system/nsec/ns3/named.conf.j2 +++ b/bin/tests/system/nsec/ns3/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation yes; max-records-per-type 2; diff --git a/bin/tests/system/nsec3/ns5/named.conf.j2 b/bin/tests/system/nsec3/ns5/named.conf.j2 index deec62de8ce..cadf4348508 100644 --- a/bin/tests/system/nsec3/ns5/named.conf.j2 +++ b/bin/tests/system/nsec3/ns5/named.conf.j2 @@ -9,7 +9,6 @@ options { listen-on { 10.53.0.5; }; listen-on-v6 { none; }; allow-transfer { any; }; - recursion yes; dnssec-validation yes; send-cookie no; }; diff --git a/bin/tests/system/nsec3_impersonation/ns2/named.conf.j2 b/bin/tests/system/nsec3_impersonation/ns2/named.conf.j2 index c2acbe07d9e..5e5f1b50984 100644 --- a/bin/tests/system/nsec3_impersonation/ns2/named.conf.j2 +++ b/bin/tests/system/nsec3_impersonation/ns2/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.2; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation yes; }; diff --git a/bin/tests/system/nsec_grandparent/ns2/named.conf.j2 b/bin/tests/system/nsec_grandparent/ns2/named.conf.j2 index 2104ede4ccf..af3f31fe676 100644 --- a/bin/tests/system/nsec_grandparent/ns2/named.conf.j2 +++ b/bin/tests/system/nsec_grandparent/ns2/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.2; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation yes; minimal-responses no; }; diff --git a/bin/tests/system/nsec_piggyback/ns3/named.conf.j2 b/bin/tests/system/nsec_piggyback/ns3/named.conf.j2 index 3eae8ab0ae2..fbd80cb1771 100644 --- a/bin/tests/system/nsec_piggyback/ns3/named.conf.j2 +++ b/bin/tests/system/nsec_piggyback/ns3/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation yes; synth-from-dnssec yes; }; diff --git a/bin/tests/system/nsec_synthesis/ns2/named.conf.j2 b/bin/tests/system/nsec_synthesis/ns2/named.conf.j2 index 5a3e2199a6a..ee3e3a47542 100644 --- a/bin/tests/system/nsec_synthesis/ns2/named.conf.j2 +++ b/bin/tests/system/nsec_synthesis/ns2/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.2; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation yes; synth-from-dnssec yes; }; diff --git a/bin/tests/system/nslimit_outdomain/ns4/named.conf.j2 b/bin/tests/system/nslimit_outdomain/ns4/named.conf.j2 index 05d992cc739..306425dd685 100644 --- a/bin/tests/system/nslimit_outdomain/ns4/named.conf.j2 +++ b/bin/tests/system/nslimit_outdomain/ns4/named.conf.j2 @@ -20,7 +20,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.4; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; dnstap { resolver query; }; dnstap-output file "dnstap.out"; diff --git a/bin/tests/system/nsprocessinglimit/ns4/named.conf.j2 b/bin/tests/system/nsprocessinglimit/ns4/named.conf.j2 index 8e98fcc2ecf..f9f1535550f 100644 --- a/bin/tests/system/nsprocessinglimit/ns4/named.conf.j2 +++ b/bin/tests/system/nsprocessinglimit/ns4/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.4; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; dnstap { resolver query; }; dnstap-output file "dnstap.out"; diff --git a/bin/tests/system/nsupdate/ns2/named.conf.j2 b/bin/tests/system/nsupdate/ns2/named.conf.j2 index a9f1f0281c1..2264cff2c80 100644 --- a/bin/tests/system/nsupdate/ns2/named.conf.j2 +++ b/bin/tests/system/nsupdate/ns2/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.2; }; listen-on-v6 { none; }; - recursion yes; serial-query-rate 1; // workaround for KB AA-01213 dnssec-validation no; }; diff --git a/bin/tests/system/nta/ns4/named.conf.j2 b/bin/tests/system/nta/ns4/named.conf.j2 index d6557e83f1c..885a7da507d 100644 --- a/bin/tests/system/nta/ns4/named.conf.j2 +++ b/bin/tests/system/nta/ns4/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.4; }; listen-on-v6 { none; }; - recursion yes; minimal-responses no; nta-lifetime 12s; diff --git a/bin/tests/system/nta/ns9/named.conf.j2 b/bin/tests/system/nta/ns9/named.conf.j2 index c993f22f25d..2ebdb317959 100644 --- a/bin/tests/system/nta/ns9/named.conf.j2 +++ b/bin/tests/system/nta/ns9/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.9; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation yes; forward only; forwarders { 10.53.0.4; }; diff --git a/bin/tests/system/padding/ns2/named.conf.j2 b/bin/tests/system/padding/ns2/named.conf.j2 index 49d3059ec29..dce128fc23a 100644 --- a/bin/tests/system/padding/ns2/named.conf.j2 +++ b/bin/tests/system/padding/ns2/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.2; }; listen-on-v6 { none; }; - recursion yes; send-cookie yes; response-padding { !10.53.0.8; any; } block-size 64; dnssec-validation no; diff --git a/bin/tests/system/padding/ns3/named.conf.j2 b/bin/tests/system/padding/ns3/named.conf.j2 index 6f221378dd8..503ae8c0253 100644 --- a/bin/tests/system/padding/ns3/named.conf.j2 +++ b/bin/tests/system/padding/ns3/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; }; diff --git a/bin/tests/system/padding/ns4/named.conf.j2 b/bin/tests/system/padding/ns4/named.conf.j2 index 141f05071dc..0077edf19b8 100644 --- a/bin/tests/system/padding/ns4/named.conf.j2 +++ b/bin/tests/system/padding/ns4/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.4; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; }; diff --git a/bin/tests/system/pending/ns4/named.conf.j2 b/bin/tests/system/pending/ns4/named.conf.j2 index 357672b9589..e66e158f1c3 100644 --- a/bin/tests/system/pending/ns4/named.conf.j2 +++ b/bin/tests/system/pending/ns4/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.4; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation yes; }; diff --git a/bin/tests/system/pipelined/ns2/named.conf.j2 b/bin/tests/system/pipelined/ns2/named.conf.j2 index 65dfc25385f..723755fed29 100644 --- a/bin/tests/system/pipelined/ns2/named.conf.j2 +++ b/bin/tests/system/pipelined/ns2/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.2; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; }; diff --git a/bin/tests/system/pipelined/ns3/named.conf.j2 b/bin/tests/system/pipelined/ns3/named.conf.j2 index 198125806eb..c25a777c42d 100644 --- a/bin/tests/system/pipelined/ns3/named.conf.j2 +++ b/bin/tests/system/pipelined/ns3/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; }; diff --git a/bin/tests/system/pipelined/ns4/named.conf.j2 b/bin/tests/system/pipelined/ns4/named.conf.j2 index b5a0f2de7d2..57069ab5bce 100644 --- a/bin/tests/system/pipelined/ns4/named.conf.j2 +++ b/bin/tests/system/pipelined/ns4/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.4; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; }; diff --git a/bin/tests/system/qmin/ns5/named.conf.j2 b/bin/tests/system/qmin/ns5/named.conf.j2 index c4629e0b7d7..051f63106cd 100644 --- a/bin/tests/system/qmin/ns5/named.conf.j2 +++ b/bin/tests/system/qmin/ns5/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.5; }; listen-on-v6 { none; }; - recursion yes; qname-minimization disabled; querylog yes; resolver-query-timeout 30000; # 30 seconds diff --git a/bin/tests/system/qmin/ns6/named.conf.j2 b/bin/tests/system/qmin/ns6/named.conf.j2 index 8fd0a1628b8..6318d4c3e48 100644 --- a/bin/tests/system/qmin/ns6/named.conf.j2 +++ b/bin/tests/system/qmin/ns6/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.6; }; listen-on-v6 { none; }; - recursion yes; qname-minimization strict; querylog yes; resolver-query-timeout 30000; # 30 seconds diff --git a/bin/tests/system/qmin/ns7/named.conf.j2 b/bin/tests/system/qmin/ns7/named.conf.j2 index 5609ba0ee13..12f65d0472e 100644 --- a/bin/tests/system/qmin/ns7/named.conf.j2 +++ b/bin/tests/system/qmin/ns7/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.7; }; listen-on-v6 { none; }; - recursion yes; qname-minimization relaxed; querylog yes; resolver-query-timeout 30000; # 30 seconds diff --git a/bin/tests/system/qpcache_rrsig_any/ns2/named.conf.j2 b/bin/tests/system/qpcache_rrsig_any/ns2/named.conf.j2 index f6b0c88efb7..8b7a93cc3ae 100644 --- a/bin/tests/system/qpcache_rrsig_any/ns2/named.conf.j2 +++ b/bin/tests/system/qpcache_rrsig_any/ns2/named.conf.j2 @@ -21,7 +21,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.2; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; }; diff --git a/bin/tests/system/query_source/ns2/named.conf.j2 b/bin/tests/system/query_source/ns2/named.conf.j2 index 93622283dc7..bdccdbe718a 100644 --- a/bin/tests/system/query_source/ns2/named.conf.j2 +++ b/bin/tests/system/query_source/ns2/named.conf.j2 @@ -5,7 +5,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.2; }; listen-on-v6 { fd92:7065:b8e:ffff::2; }; - recursion yes; dnssec-validation no; query-source none; query-source-v6 fd92:7065:b8e:ffff::2; diff --git a/bin/tests/system/query_source/ns3/named.conf.j2 b/bin/tests/system/query_source/ns3/named.conf.j2 index fd53f119f89..3c9397543cd 100644 --- a/bin/tests/system/query_source/ns3/named.conf.j2 +++ b/bin/tests/system/query_source/ns3/named.conf.j2 @@ -5,7 +5,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { fd92:7065:b8e:ffff::3; }; - recursion yes; dnssec-validation no; query-source-v6 none; query-source 10.53.0.3; diff --git a/bin/tests/system/query_source/ns4/named.conf.j2 b/bin/tests/system/query_source/ns4/named.conf.j2 index f3fa76a0aa7..39f8bae666a 100644 --- a/bin/tests/system/query_source/ns4/named.conf.j2 +++ b/bin/tests/system/query_source/ns4/named.conf.j2 @@ -5,7 +5,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.4; }; listen-on-v6 { fd92:7065:b8e:ffff::4; }; - recursion yes; dnssec-validation no; query-source none; query-source-v6 fd92:7065:b8e:ffff::4; diff --git a/bin/tests/system/query_source/ns5/named.conf.j2 b/bin/tests/system/query_source/ns5/named.conf.j2 index e21c98fccb2..1fb6b133464 100644 --- a/bin/tests/system/query_source/ns5/named.conf.j2 +++ b/bin/tests/system/query_source/ns5/named.conf.j2 @@ -5,7 +5,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.5; }; listen-on-v6 { fd92:7065:b8e:ffff::5; }; - recursion yes; dnssec-validation no; query-source 10.53.0.5; query-source-v6 none; diff --git a/bin/tests/system/randomizens/ns6/named.conf.j2 b/bin/tests/system/randomizens/ns6/named.conf.j2 index e67202cb033..da1a169fc71 100644 --- a/bin/tests/system/randomizens/ns6/named.conf.j2 +++ b/bin/tests/system/randomizens/ns6/named.conf.j2 @@ -7,7 +7,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.6; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; }; diff --git a/bin/tests/system/reclimit/ns3/named.conf.j2 b/bin/tests/system/reclimit/ns3/named.conf.j2 index 70c96035c31..1a4c5a46130 100644 --- a/bin/tests/system/reclimit/ns3/named.conf.j2 +++ b/bin/tests/system/reclimit/ns3/named.conf.j2 @@ -10,7 +10,6 @@ options { qname-minimization disabled; max-recursion-queries 50; max-recursion-depth 12; - recursion yes; dnssec-validation no; }; diff --git a/bin/tests/system/reclimit/ns3/named2.conf.j2 b/bin/tests/system/reclimit/ns3/named2.conf.j2 index 6a9908d2d8a..c106324b5a1 100644 --- a/bin/tests/system/reclimit/ns3/named2.conf.j2 +++ b/bin/tests/system/reclimit/ns3/named2.conf.j2 @@ -9,7 +9,6 @@ options { servfail-ttl 0; qname-minimization disabled; max-recursion-depth 5; - recursion yes; dnssec-validation no; }; diff --git a/bin/tests/system/reclimit/ns3/named3.conf.j2 b/bin/tests/system/reclimit/ns3/named3.conf.j2 index f9c6e69ce67..7d27c387319 100644 --- a/bin/tests/system/reclimit/ns3/named3.conf.j2 +++ b/bin/tests/system/reclimit/ns3/named3.conf.j2 @@ -10,7 +10,6 @@ options { qname-minimization disabled; max-recursion-depth 100; max-recursion-queries 50; - recursion yes; dnssec-validation no; }; diff --git a/bin/tests/system/reclimit/ns3/named4.conf.j2 b/bin/tests/system/reclimit/ns3/named4.conf.j2 index 1be2229b04c..ec5a56062b5 100644 --- a/bin/tests/system/reclimit/ns3/named4.conf.j2 +++ b/bin/tests/system/reclimit/ns3/named4.conf.j2 @@ -10,7 +10,6 @@ options { qname-minimization disabled; max-recursion-depth 100; max-recursion-queries 40; - recursion yes; dnssec-validation no; }; diff --git a/bin/tests/system/reclimit/ns3/named5.conf.j2 b/bin/tests/system/reclimit/ns3/named5.conf.j2 index fb46f2ffbbb..934290685d8 100644 --- a/bin/tests/system/reclimit/ns3/named5.conf.j2 +++ b/bin/tests/system/reclimit/ns3/named5.conf.j2 @@ -9,7 +9,6 @@ options { servfail-ttl 0; qname-minimization disabled; max-recursion-depth 12; - recursion yes; dnssec-validation no; max-records-per-type 0; max-types-per-name 10; diff --git a/bin/tests/system/reclimit/ns3/named6.conf.j2 b/bin/tests/system/reclimit/ns3/named6.conf.j2 index cb6beb06bcf..c296961f1d2 100644 --- a/bin/tests/system/reclimit/ns3/named6.conf.j2 +++ b/bin/tests/system/reclimit/ns3/named6.conf.j2 @@ -9,7 +9,6 @@ options { servfail-ttl 0; qname-minimization disabled; max-recursion-depth 12; - recursion yes; dnssec-validation no; max-records-per-type 0; max-types-per-name 0; diff --git a/bin/tests/system/redirect/ns2/named.conf.j2 b/bin/tests/system/redirect/ns2/named.conf.j2 index 1546e9acdc5..975ecf22357 100644 --- a/bin/tests/system/redirect/ns2/named.conf.j2 +++ b/bin/tests/system/redirect/ns2/named.conf.j2 @@ -10,7 +10,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.2; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; }; diff --git a/bin/tests/system/redirect/ns4/named.conf.j2 b/bin/tests/system/redirect/ns4/named.conf.j2 index a8a9691a398..ad4a040b518 100644 --- a/bin/tests/system/redirect/ns4/named.conf.j2 +++ b/bin/tests/system/redirect/ns4/named.conf.j2 @@ -10,7 +10,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.4; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; nxdomain-redirect "redirect"; }; diff --git a/bin/tests/system/resend_loop/ns1/named.conf.j2 b/bin/tests/system/resend_loop/ns1/named.conf.j2 index 23ce10ae0b4..2ca78bca60c 100644 --- a/bin/tests/system/resend_loop/ns1/named.conf.j2 +++ b/bin/tests/system/resend_loop/ns1/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.1; }; listen-on-v6 { none; }; - recursion yes; allow-query { any; }; forwarders { 10.53.0.3 port @PORT@; }; forward only; diff --git a/bin/tests/system/resend_loop/ns4/named.conf.j2 b/bin/tests/system/resend_loop/ns4/named.conf.j2 index 86c074af8a7..873c4a39514 100644 --- a/bin/tests/system/resend_loop/ns4/named.conf.j2 +++ b/bin/tests/system/resend_loop/ns4/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.4; }; listen-on-v6 { none; }; query-source-v6 none; - recursion yes; dnssec-validation no; }; diff --git a/bin/tests/system/resolver/ns1/named.conf.j2 b/bin/tests/system/resolver/ns1/named.conf.j2 index 905e96b4cbe..734f2d4da5c 100644 --- a/bin/tests/system/resolver/ns1/named.conf.j2 +++ b/bin/tests/system/resolver/ns1/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.1; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; deny-answer-addresses { 192.0.2.0/24; 2001:db8:beef::/48; } except-from { "example.org"; }; diff --git a/bin/tests/system/resolver/ns1/named2.conf.j2 b/bin/tests/system/resolver/ns1/named2.conf.j2 index ee251467830..ccc6c1bf564 100644 --- a/bin/tests/system/resolver/ns1/named2.conf.j2 +++ b/bin/tests/system/resolver/ns1/named2.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.1; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; attach-cache "globalcache"; max-zone-ttl unlimited; diff --git a/bin/tests/system/resolver/ns5/named.conf.j2 b/bin/tests/system/resolver/ns5/named.conf.j2 index ac2b5934913..854f27b4fd9 100644 --- a/bin/tests/system/resolver/ns5/named.conf.j2 +++ b/bin/tests/system/resolver/ns5/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.5; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation yes; querylog yes; prefetch 4 10; diff --git a/bin/tests/system/resolver/ns7/named.conf.j2 b/bin/tests/system/resolver/ns7/named.conf.j2 index b8e1e558efd..5c9745a7c91 100644 --- a/bin/tests/system/resolver/ns7/named.conf.j2 +++ b/bin/tests/system/resolver/ns7/named.conf.j2 @@ -11,7 +11,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.7; }; listen-on-v6 { fd92:7065:b8e:ffff::7; }; - recursion yes; dnssec-validation no; empty-zones-enable yes; disable-empty-zone 20.172.in-addr.arpa; diff --git a/bin/tests/system/resolver/ns7/named2.conf.j2 b/bin/tests/system/resolver/ns7/named2.conf.j2 index 1770988387b..117fe7cb805 100644 --- a/bin/tests/system/resolver/ns7/named2.conf.j2 +++ b/bin/tests/system/resolver/ns7/named2.conf.j2 @@ -11,7 +11,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.7; }; listen-on-v6 { fd92:7065:b8e:ffff::7; }; - recursion yes; dnssec-validation no; empty-zones-enable yes; disable-empty-zone 20.172.in-addr.arpa; diff --git a/bin/tests/system/resolver/ns9/named.conf.j2 b/bin/tests/system/resolver/ns9/named.conf.j2 index c0bcc833092..ce504c78155 100644 --- a/bin/tests/system/resolver/ns9/named.conf.j2 +++ b/bin/tests/system/resolver/ns9/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { none; }; listen-on-v6 { fd92:7065:b8e:ffff::9; }; - recursion yes; recursive-clients 0; // regression test for [GL #4987] dnssec-validation no; dual-stack-servers { fd92:7065:b8e:ffff::7; }; diff --git a/bin/tests/system/rndc/ns4/named.conf.j2 b/bin/tests/system/rndc/ns4/named.conf.j2 index c41c5bcbcea..d1bee45bece 100644 --- a/bin/tests/system/rndc/ns4/named.conf.j2 +++ b/bin/tests/system/rndc/ns4/named.conf.j2 @@ -7,7 +7,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.4; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; }; diff --git a/bin/tests/system/rollover/ns3/named.common.conf.j2 b/bin/tests/system/rollover/ns3/named.common.conf.j2 index b17d35b0ff9..6d06280562d 100644 --- a/bin/tests/system/rollover/ns3/named.common.conf.j2 +++ b/bin/tests/system/rollover/ns3/named.common.conf.j2 @@ -15,7 +15,6 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { none; }; allow-transfer { any; }; - recursion yes; dnssec-validation @dnssec_validation@; notify-cfg CDS { notify yes; }; }; diff --git a/bin/tests/system/rootkeysentinel/ns3/named.conf.j2 b/bin/tests/system/rootkeysentinel/ns3/named.conf.j2 index 19a2a339558..d1819558a3e 100644 --- a/bin/tests/system/rootkeysentinel/ns3/named.conf.j2 +++ b/bin/tests/system/rootkeysentinel/ns3/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation yes; root-key-sentinel yes; }; diff --git a/bin/tests/system/rootkeysentinel/ns4/named.conf.j2 b/bin/tests/system/rootkeysentinel/ns4/named.conf.j2 index 49e7591ae1a..bb3cf6fa678 100644 --- a/bin/tests/system/rootkeysentinel/ns4/named.conf.j2 +++ b/bin/tests/system/rootkeysentinel/ns4/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.4; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation yes; root-key-sentinel no; }; diff --git a/bin/tests/system/rpz/ns10/named.conf.j2 b/bin/tests/system/rpz/ns10/named.conf.j2 index 812252fb6c3..2797e5e1380 100644 --- a/bin/tests/system/rpz/ns10/named.conf.j2 +++ b/bin/tests/system/rpz/ns10/named.conf.j2 @@ -11,7 +11,6 @@ options { notify no; minimal-any no; minimal-responses no; - recursion yes; dnssec-validation yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/rpz/ns2/named.conf.j2 b/bin/tests/system/rpz/ns2/named.conf.j2 index dfec3c3663e..54d95c6cbac 100644 --- a/bin/tests/system/rpz/ns2/named.conf.j2 +++ b/bin/tests/system/rpz/ns2/named.conf.j2 @@ -11,7 +11,6 @@ options { notify no; minimal-any no; minimal-responses no; - recursion yes; dnssec-validation yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/rpz/ns3/named.conf.j2 b/bin/tests/system/rpz/ns3/named.conf.j2 index bd9ccf9c344..028c75f67a8 100644 --- a/bin/tests/system/rpz/ns3/named.conf.j2 +++ b/bin/tests/system/rpz/ns3/named.conf.j2 @@ -17,7 +17,6 @@ options { allow-transfer { any; }; minimal-any no; minimal-responses no; - recursion yes; dnssec-validation no; min-refresh-time 1; min-retry-time 1; diff --git a/bin/tests/system/rpz/ns4/named.conf.j2 b/bin/tests/system/rpz/ns4/named.conf.j2 index c64ef18c0a8..29e7e259262 100644 --- a/bin/tests/system/rpz/ns4/named.conf.j2 +++ b/bin/tests/system/rpz/ns4/named.conf.j2 @@ -11,7 +11,6 @@ options { notify no; minimal-any no; minimal-responses no; - recursion yes; dnssec-validation yes; }; diff --git a/bin/tests/system/rpz/ns5/named.conf.j2 b/bin/tests/system/rpz/ns5/named.conf.j2 index 887803d0595..0270ec31d3c 100644 --- a/bin/tests/system/rpz/ns5/named.conf.j2 +++ b/bin/tests/system/rpz/ns5/named.conf.j2 @@ -17,7 +17,6 @@ options { notify-delay 0; minimal-any no; minimal-responses no; - recursion yes; dnssec-validation yes; # turn rpz on or off diff --git a/bin/tests/system/rpz/ns6/named.conf.j2 b/bin/tests/system/rpz/ns6/named.conf.j2 index 8686ce9e802..a40145f9113 100644 --- a/bin/tests/system/rpz/ns6/named.conf.j2 +++ b/bin/tests/system/rpz/ns6/named.conf.j2 @@ -13,7 +13,6 @@ options { forwarders { 10.53.0.3; }; minimal-any no; minimal-responses no; - recursion yes; dnssec-validation yes; qname-minimization disabled; diff --git a/bin/tests/system/rpz/ns7/named.conf.j2 b/bin/tests/system/rpz/ns7/named.conf.j2 index af971767d48..0af33eb5764 100644 --- a/bin/tests/system/rpz/ns7/named.conf.j2 +++ b/bin/tests/system/rpz/ns7/named.conf.j2 @@ -11,7 +11,6 @@ options { allow-transfer { any; }; minimal-any no; minimal-responses no; - recursion yes; dnssec-validation yes; response-policy { diff --git a/bin/tests/system/rpz/ns8/named.conf.j2 b/bin/tests/system/rpz/ns8/named.conf.j2 index 585f7b18095..832ddba12ca 100644 --- a/bin/tests/system/rpz/ns8/named.conf.j2 +++ b/bin/tests/system/rpz/ns8/named.conf.j2 @@ -15,7 +15,6 @@ options { allow-transfer { any; }; minimal-any no; minimal-responses no; - recursion yes; dnssec-validation no; response-policy { diff --git a/bin/tests/system/rpz/ns9/named.conf.j2 b/bin/tests/system/rpz/ns9/named.conf.j2 index 518ea7b62cb..ffa402bb387 100644 --- a/bin/tests/system/rpz/ns9/named.conf.j2 +++ b/bin/tests/system/rpz/ns9/named.conf.j2 @@ -15,7 +15,6 @@ options { allow-transfer { any; }; minimal-any no; minimal-responses no; - recursion yes; dnssec-validation no; dns64-server "example.localdomain."; dns64 64:ff9b::/96 { }; diff --git a/bin/tests/system/rpzextra/ns3/named.conf.j2 b/bin/tests/system/rpzextra/ns3/named.conf.j2 index 08723e4302d..7c240c8c27e 100644 --- a/bin/tests/system/rpzextra/ns3/named.conf.j2 +++ b/bin/tests/system/rpzextra/ns3/named.conf.j2 @@ -12,7 +12,6 @@ options { dnssec-validation no; allow-query { any; }; minimal-any no; - recursion yes; allow-recursion { any; }; empty-zones-enable false; response-policy { diff --git a/bin/tests/system/rpzrecurse/ns2/named.conf.header.j2 b/bin/tests/system/rpzrecurse/ns2/named.conf.header.j2 index 429f764db56..7fa20f4c95c 100644 --- a/bin/tests/system/rpzrecurse/ns2/named.conf.header.j2 +++ b/bin/tests/system/rpzrecurse/ns2/named.conf.header.j2 @@ -7,7 +7,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.2; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; querylog yes; }; diff --git a/bin/tests/system/rpzrecurse/ns3/named1.conf.j2 b/bin/tests/system/rpzrecurse/ns3/named1.conf.j2 index 63af1656d2b..9a100c8b069 100644 --- a/bin/tests/system/rpzrecurse/ns3/named1.conf.j2 +++ b/bin/tests/system/rpzrecurse/ns3/named1.conf.j2 @@ -9,7 +9,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; response-policy { zone "policy"; } qname-wait-recurse yes diff --git a/bin/tests/system/rpzrecurse/ns3/named2.conf.j2 b/bin/tests/system/rpzrecurse/ns3/named2.conf.j2 index bda6f5ab3d4..6259bb72c5f 100644 --- a/bin/tests/system/rpzrecurse/ns3/named2.conf.j2 +++ b/bin/tests/system/rpzrecurse/ns3/named2.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; response-policy { zone "policy"; } nsip-wait-recurse no diff --git a/bin/tests/system/rpzrecurse/ns3/named3.conf.j2 b/bin/tests/system/rpzrecurse/ns3/named3.conf.j2 index cb526293acb..8a5362c3698 100644 --- a/bin/tests/system/rpzrecurse/ns3/named3.conf.j2 +++ b/bin/tests/system/rpzrecurse/ns3/named3.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; response-policy { zone "policy"; } nsip-wait-recurse no diff --git a/bin/tests/system/rrl/ns1/named.conf.j2 b/bin/tests/system/rrl/ns1/named.conf.j2 index 18ba4156332..31c2dbdfa95 100644 --- a/bin/tests/system/rrl/ns1/named.conf.j2 +++ b/bin/tests/system/rrl/ns1/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; notify no; - recursion yes; dnssec-validation no; }; diff --git a/bin/tests/system/rrl/ns2/named.conf.j2 b/bin/tests/system/rrl/ns2/named.conf.j2 index a88e3d0d4cf..c0908276480 100644 --- a/bin/tests/system/rrl/ns2/named.conf.j2 +++ b/bin/tests/system/rrl/ns2/named.conf.j2 @@ -9,7 +9,6 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; notify no; - recursion yes; dnssec-validation no; rate-limit { diff --git a/bin/tests/system/rrl/ns3/named.conf.j2 b/bin/tests/system/rrl/ns3/named.conf.j2 index 20fff8ff646..83406aa02c4 100644 --- a/bin/tests/system/rrl/ns3/named.conf.j2 +++ b/bin/tests/system/rrl/ns3/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { none; }; notify no; - recursion yes; dnssec-validation no; // check that all of the options are parsed without limiting anything diff --git a/bin/tests/system/rrl/ns4/named.conf.j2 b/bin/tests/system/rrl/ns4/named.conf.j2 index 1f754efd792..5b50e9b9ea1 100644 --- a/bin/tests/system/rrl/ns4/named.conf.j2 +++ b/bin/tests/system/rrl/ns4/named.conf.j2 @@ -9,7 +9,6 @@ options { listen-on { 10.53.0.4; }; listen-on-v6 { none; }; notify no; - recursion yes; dnssec-validation no; max-udp-size 4096; diff --git a/bin/tests/system/rrsetorder/ns3/named.conf.j2 b/bin/tests/system/rrsetorder/ns3/named.conf.j2 index b99aff2d8eb..2cd32dcff7b 100644 --- a/bin/tests/system/rrsetorder/ns3/named.conf.j2 +++ b/bin/tests/system/rrsetorder/ns3/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; rrset-order { name "random.example" order random; diff --git a/bin/tests/system/rrsetorder/ns4/named.conf.j2 b/bin/tests/system/rrsetorder/ns4/named.conf.j2 index 642af44c879..ba6aec78d96 100644 --- a/bin/tests/system/rrsetorder/ns4/named.conf.j2 +++ b/bin/tests/system/rrsetorder/ns4/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.4; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; rrset-order { class IN type A name "host.example.com" order random; diff --git a/bin/tests/system/rrsetorder/ns5/named.conf.j2 b/bin/tests/system/rrsetorder/ns5/named.conf.j2 index 7a3b5db1611..1a20346ff86 100644 --- a/bin/tests/system/rrsetorder/ns5/named.conf.j2 +++ b/bin/tests/system/rrsetorder/ns5/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.5; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; }; diff --git a/bin/tests/system/selfpointedglue/ns4/named.conf.j2 b/bin/tests/system/selfpointedglue/ns4/named.conf.j2 index 05d992cc739..306425dd685 100644 --- a/bin/tests/system/selfpointedglue/ns4/named.conf.j2 +++ b/bin/tests/system/selfpointedglue/ns4/named.conf.j2 @@ -20,7 +20,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.4; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; dnstap { resolver query; }; dnstap-output file "dnstap.out"; diff --git a/bin/tests/system/serve_stale/ns1/named.conf.j2 b/bin/tests/system/serve_stale/ns1/named.conf.j2 index 37b439896f0..2463cb7b6da 100644 --- a/bin/tests/system/serve_stale/ns1/named.conf.j2 +++ b/bin/tests/system/serve_stale/ns1/named.conf.j2 @@ -14,7 +14,6 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; allow-transfer { any; }; - recursion yes; dnssec-validation no; max-stale-ttl @max_stale_ttl@; stale-answer-ttl @stale_answer_ttl@; diff --git a/bin/tests/system/serve_stale/ns3/named.conf.j2 b/bin/tests/system/serve_stale/ns3/named.conf.j2 index cd6bdd85736..43a3eb60c71 100644 --- a/bin/tests/system/serve_stale/ns3/named.conf.j2 +++ b/bin/tests/system/serve_stale/ns3/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; qname-minimization off; prefetch 0; diff --git a/bin/tests/system/serve_stale/ns3/named1.conf.j2 b/bin/tests/system/serve_stale/ns3/named1.conf.j2 index 336d2dbf98b..c39143bc2a3 100644 --- a/bin/tests/system/serve_stale/ns3/named1.conf.j2 +++ b/bin/tests/system/serve_stale/ns3/named1.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion yes; dump-file "named_dump3.db"; stale-cache-enable yes; dnssec-validation no; diff --git a/bin/tests/system/serve_stale/ns3/named2.conf.j2 b/bin/tests/system/serve_stale/ns3/named2.conf.j2 index dce1027cf92..f882eb106da 100644 --- a/bin/tests/system/serve_stale/ns3/named2.conf.j2 +++ b/bin/tests/system/serve_stale/ns3/named2.conf.j2 @@ -13,7 +13,6 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { none; }; dnssec-validation no; - recursion yes; stale-answer-enable yes; stale-cache-enable yes; stale-answer-ttl 3; diff --git a/bin/tests/system/serve_stale/ns3/named3.conf.j2 b/bin/tests/system/serve_stale/ns3/named3.conf.j2 index 3c0458d6c08..7552593551a 100644 --- a/bin/tests/system/serve_stale/ns3/named3.conf.j2 +++ b/bin/tests/system/serve_stale/ns3/named3.conf.j2 @@ -13,7 +13,6 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { none; }; dnssec-validation no; - recursion yes; stale-answer-enable yes; stale-cache-enable yes; stale-answer-ttl 3; diff --git a/bin/tests/system/serve_stale/ns3/named4.conf.j2 b/bin/tests/system/serve_stale/ns3/named4.conf.j2 index 34fa3489e5f..f42792dbfc6 100644 --- a/bin/tests/system/serve_stale/ns3/named4.conf.j2 +++ b/bin/tests/system/serve_stale/ns3/named4.conf.j2 @@ -13,7 +13,6 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { none; }; dnssec-validation no; - recursion yes; stale-answer-enable yes; stale-cache-enable yes; stale-answer-ttl 3; diff --git a/bin/tests/system/serve_stale/ns3/named5.conf.j2 b/bin/tests/system/serve_stale/ns3/named5.conf.j2 index 105b58db988..8f1d8673dc5 100644 --- a/bin/tests/system/serve_stale/ns3/named5.conf.j2 +++ b/bin/tests/system/serve_stale/ns3/named5.conf.j2 @@ -13,7 +13,6 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { none; }; dnssec-validation no; - recursion yes; stale-answer-enable yes; stale-cache-enable yes; stale-answer-ttl 3; diff --git a/bin/tests/system/serve_stale/ns3/named6.conf.j2 b/bin/tests/system/serve_stale/ns3/named6.conf.j2 index cf451999520..16285995d5b 100644 --- a/bin/tests/system/serve_stale/ns3/named6.conf.j2 +++ b/bin/tests/system/serve_stale/ns3/named6.conf.j2 @@ -9,7 +9,6 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { none; }; dnssec-validation no; - recursion yes; stale-answer-enable no; stale-cache-enable yes; stale-answer-ttl 3; diff --git a/bin/tests/system/serve_stale/ns3/named7.conf.j2 b/bin/tests/system/serve_stale/ns3/named7.conf.j2 index 0e8317750ec..b39bcc6e2e2 100644 --- a/bin/tests/system/serve_stale/ns3/named7.conf.j2 +++ b/bin/tests/system/serve_stale/ns3/named7.conf.j2 @@ -13,7 +13,6 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { none; }; dnssec-validation no; - recursion yes; /* * stale-answer-enable is not strictly required because serving * stale answers is enabled in the test via rndc. diff --git a/bin/tests/system/serve_stale/ns3/named8.conf.j2 b/bin/tests/system/serve_stale/ns3/named8.conf.j2 index 3dbf03b7628..4e5b6b79b21 100644 --- a/bin/tests/system/serve_stale/ns3/named8.conf.j2 +++ b/bin/tests/system/serve_stale/ns3/named8.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; stale-answer-enable yes; stale-cache-enable yes; diff --git a/bin/tests/system/serve_stale/ns3/named9.conf.j2 b/bin/tests/system/serve_stale/ns3/named9.conf.j2 index 49d25134759..05bab5cf6cf 100644 --- a/bin/tests/system/serve_stale/ns3/named9.conf.j2 +++ b/bin/tests/system/serve_stale/ns3/named9.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; stale-answer-enable yes; stale-cache-enable yes; diff --git a/bin/tests/system/serve_stale/ns4/named.conf.j2 b/bin/tests/system/serve_stale/ns4/named.conf.j2 index 33720fdfb58..f0be8fd6b86 100644 --- a/bin/tests/system/serve_stale/ns4/named.conf.j2 +++ b/bin/tests/system/serve_stale/ns4/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.4; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; dump-file "named_dump.db"; stale-answer-enable no; diff --git a/bin/tests/system/serve_stale/ns5/named.conf.j2 b/bin/tests/system/serve_stale/ns5/named.conf.j2 index 65ae9889fab..953e8d6382d 100644 --- a/bin/tests/system/serve_stale/ns5/named.conf.j2 +++ b/bin/tests/system/serve_stale/ns5/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.5; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; dump-file "named_dump.db"; stale-answer-enable yes; diff --git a/bin/tests/system/serve_stale/ns7/named.conf.j2 b/bin/tests/system/serve_stale/ns7/named.conf.j2 index fb88088d612..a5fdbff336e 100644 --- a/bin/tests/system/serve_stale/ns7/named.conf.j2 +++ b/bin/tests/system/serve_stale/ns7/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.7; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; qname-minimization off; diff --git a/bin/tests/system/serve_stale/ns7/named1.conf.j2 b/bin/tests/system/serve_stale/ns7/named1.conf.j2 index daf6481e127..96cd2fec205 100644 --- a/bin/tests/system/serve_stale/ns7/named1.conf.j2 +++ b/bin/tests/system/serve_stale/ns7/named1.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.7; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; qname-minimization off; diff --git a/bin/tests/system/serve_stale_tcp/ns2/named.conf.j2 b/bin/tests/system/serve_stale_tcp/ns2/named.conf.j2 index ca238009140..c616e9b035d 100644 --- a/bin/tests/system/serve_stale_tcp/ns2/named.conf.j2 +++ b/bin/tests/system/serve_stale_tcp/ns2/named.conf.j2 @@ -23,7 +23,6 @@ options { notify-source 10.53.0.2; transfer-source 10.53.0.2; - recursion yes; dnssec-validation no; qname-minimization off; diff --git a/bin/tests/system/sfcache/ns5/named.conf.j2 b/bin/tests/system/sfcache/ns5/named.conf.j2 index c13e8be4a72..470266661a7 100644 --- a/bin/tests/system/sfcache/ns5/named.conf.j2 +++ b/bin/tests/system/sfcache/ns5/named.conf.j2 @@ -10,7 +10,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.5; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation yes; servfail-ttl @servfail_ttl@; }; diff --git a/bin/tests/system/sfcache_cname/ns2/named.conf.j2 b/bin/tests/system/sfcache_cname/ns2/named.conf.j2 index 489d18ea4f2..72e239c2ec5 100644 --- a/bin/tests/system/sfcache_cname/ns2/named.conf.j2 +++ b/bin/tests/system/sfcache_cname/ns2/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { @ns.ip@; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; qname-minimization off; servfail-ttl 5; diff --git a/bin/tests/system/shutdown/ns1/named.conf.j2 b/bin/tests/system/shutdown/ns1/named.conf.j2 index 49393e6f463..456c8d91002 100644 --- a/bin/tests/system/shutdown/ns1/named.conf.j2 +++ b/bin/tests/system/shutdown/ns1/named.conf.j2 @@ -11,7 +11,6 @@ options { notify no; dnssec-validation no; allow-query { any; }; - recursion yes; allow-recursion { any; }; }; diff --git a/bin/tests/system/srtt/ns6/named.conf.j2 b/bin/tests/system/srtt/ns6/named.conf.j2 index fe402430cb6..b982f371196 100644 --- a/bin/tests/system/srtt/ns6/named.conf.j2 +++ b/bin/tests/system/srtt/ns6/named.conf.j2 @@ -20,7 +20,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.6; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; dnstap { resolver query; }; dnstap-output file "dnstap.out"; diff --git a/bin/tests/system/staticstub/ns2/named.conf.j2 b/bin/tests/system/staticstub/ns2/named.conf.j2 index 01e537ba53f..514643255af 100644 --- a/bin/tests/system/staticstub/ns2/named.conf.j2 +++ b/bin/tests/system/staticstub/ns2/named.conf.j2 @@ -12,7 +12,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.2; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation yes; notify no; minimal-responses no; diff --git a/bin/tests/system/statistics/ns2/named1.conf.j2 b/bin/tests/system/statistics/ns2/named1.conf.j2 index aafc3b384a2..9cebe68a5c1 100644 --- a/bin/tests/system/statistics/ns2/named1.conf.j2 +++ b/bin/tests/system/statistics/ns2/named1.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.2; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; }; diff --git a/bin/tests/system/statistics/ns2/named2.conf.j2 b/bin/tests/system/statistics/ns2/named2.conf.j2 index 337caa9829c..6056a1040ca 100644 --- a/bin/tests/system/statistics/ns2/named2.conf.j2 +++ b/bin/tests/system/statistics/ns2/named2.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.2; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; }; diff --git a/bin/tests/system/statistics/ns3/named.conf.j2 b/bin/tests/system/statistics/ns3/named.conf.j2 index 141afea01e4..219ef08b578 100644 --- a/bin/tests/system/statistics/ns3/named.conf.j2 +++ b/bin/tests/system/statistics/ns3/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; qname-minimization disabled; zone-statistics yes; diff --git a/bin/tests/system/statschannel/ns4/named.conf.j2 b/bin/tests/system/statschannel/ns4/named.conf.j2 index be66fdd0262..ffc8d8ddfe9 100644 --- a/bin/tests/system/statschannel/ns4/named.conf.j2 +++ b/bin/tests/system/statschannel/ns4/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.4; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; notify no; minimal-responses no; diff --git a/bin/tests/system/stress/ns3/named.conf.j2 b/bin/tests/system/stress/ns3/named.conf.j2 index d5a1d01b96b..e0e376c828c 100644 --- a/bin/tests/system/stress/ns3/named.conf.j2 +++ b/bin/tests/system/stress/ns3/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; }; diff --git a/bin/tests/system/stress/ns4/named.conf.j2 b/bin/tests/system/stress/ns4/named.conf.j2 index 337ebd0b723..0b06812e39a 100644 --- a/bin/tests/system/stress/ns4/named.conf.j2 +++ b/bin/tests/system/stress/ns4/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.4; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; }; diff --git a/bin/tests/system/stub/ns3/named.conf.j2 b/bin/tests/system/stub/ns3/named.conf.j2 index 132b4e568a1..e42b318b779 100644 --- a/bin/tests/system/stub/ns3/named.conf.j2 +++ b/bin/tests/system/stub/ns3/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; minimal-responses no; }; diff --git a/bin/tests/system/synthfromdnssec/ns2/named.conf.j2 b/bin/tests/system/synthfromdnssec/ns2/named.conf.j2 index 24ba0a8cb74..a53ab224011 100644 --- a/bin/tests/system/synthfromdnssec/ns2/named.conf.j2 +++ b/bin/tests/system/synthfromdnssec/ns2/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.2; }; listen-on-v6 { none; }; - recursion yes; notify no; dnssec-validation yes; }; diff --git a/bin/tests/system/synthfromdnssec/ns3/named.conf.j2 b/bin/tests/system/synthfromdnssec/ns3/named.conf.j2 index 181a964b7ef..166ee135554 100644 --- a/bin/tests/system/synthfromdnssec/ns3/named.conf.j2 +++ b/bin/tests/system/synthfromdnssec/ns3/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion yes; notify no; dnssec-validation yes; }; diff --git a/bin/tests/system/synthfromdnssec/ns4/named.conf.j2 b/bin/tests/system/synthfromdnssec/ns4/named.conf.j2 index 0a751253075..dbef1981f30 100644 --- a/bin/tests/system/synthfromdnssec/ns4/named.conf.j2 +++ b/bin/tests/system/synthfromdnssec/ns4/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.4; }; listen-on-v6 { none; }; - recursion yes; notify no; dnssec-validation yes; synth-from-dnssec no; diff --git a/bin/tests/system/synthfromdnssec/ns5/named.conf.j2 b/bin/tests/system/synthfromdnssec/ns5/named.conf.j2 index 264ad0aa89d..866d9bb1747 100644 --- a/bin/tests/system/synthfromdnssec/ns5/named.conf.j2 +++ b/bin/tests/system/synthfromdnssec/ns5/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.5; }; listen-on-v6 { none; }; - recursion yes; notify no; dnssec-validation yes; synth-from-dnssec yes; diff --git a/bin/tests/system/synthfromdnssec/ns6/named.conf.j2 b/bin/tests/system/synthfromdnssec/ns6/named.conf.j2 index 39ac70456be..b0b97f48825 100644 --- a/bin/tests/system/synthfromdnssec/ns6/named.conf.j2 +++ b/bin/tests/system/synthfromdnssec/ns6/named.conf.j2 @@ -8,7 +8,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.6; }; listen-on-v6 { none; }; - recursion yes; notify no; dnssec-validation no; synth-from-dnssec yes; diff --git a/bin/tests/system/tcp/ns2/named.conf.j2 b/bin/tests/system/tcp/ns2/named.conf.j2 index 72d62d4cca4..32853c23a2c 100644 --- a/bin/tests/system/tcp/ns2/named.conf.j2 +++ b/bin/tests/system/tcp/ns2/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.2; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; statistics-file "named.stats"; }; diff --git a/bin/tests/system/tcp/ns3/named.conf.j2 b/bin/tests/system/tcp/ns3/named.conf.j2 index 2c625665a5f..08f83dede01 100644 --- a/bin/tests/system/tcp/ns3/named.conf.j2 +++ b/bin/tests/system/tcp/ns3/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; }; diff --git a/bin/tests/system/tcp/ns4/named.conf.j2 b/bin/tests/system/tcp/ns4/named.conf.j2 index ffab39fa1fa..1ed7f483685 100644 --- a/bin/tests/system/tcp/ns4/named.conf.j2 +++ b/bin/tests/system/tcp/ns4/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.4; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; forwarders { 10.53.0.2; }; forward only; diff --git a/bin/tests/system/tcp/ns5/named.conf.j2 b/bin/tests/system/tcp/ns5/named.conf.j2 index e533baba41f..c8f8e0553bc 100644 --- a/bin/tests/system/tcp/ns5/named.conf.j2 +++ b/bin/tests/system/tcp/ns5/named.conf.j2 @@ -12,7 +12,6 @@ options { listen-on { 10.53.0.5; }; listen-on-v6 { none; }; tcp-listen-queue 32; - recursion yes; tcp-clients 17; dnssec-validation no; }; diff --git a/bin/tests/system/tsig/ns1/named.conf.j2 b/bin/tests/system/tsig/ns1/named.conf.j2 index a4afed8c654..f4eb6a0a617 100644 --- a/bin/tests/system/tsig/ns1/named.conf.j2 +++ b/bin/tests/system/tsig/ns1/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.1; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; notify no; }; diff --git a/bin/tests/system/ttl/ns2/named.conf.j2 b/bin/tests/system/ttl/ns2/named.conf.j2 index 664b46a2596..b6874ac16b6 100644 --- a/bin/tests/system/ttl/ns2/named.conf.j2 +++ b/bin/tests/system/ttl/ns2/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; servfail-ttl 0; max-recursion-depth 12; - recursion yes; dnssec-validation no; min-cache-ttl 60; min-ncache-ttl 30; diff --git a/bin/tests/system/upforwd/ns1/named.conf.j2 b/bin/tests/system/upforwd/ns1/named.conf.j2 index 5ef6c58d0df..349dcfac1b6 100644 --- a/bin/tests/system/upforwd/ns1/named.conf.j2 +++ b/bin/tests/system/upforwd/ns1/named.conf.j2 @@ -14,7 +14,6 @@ options { listen-on tls ephemeral { 10.53.0.1; }; listen-on-v6 { none; }; allow-transfer { any; }; - recursion yes; dnssec-validation no; }; diff --git a/bin/tests/system/upforwd/ns2/named.conf.j2 b/bin/tests/system/upforwd/ns2/named.conf.j2 index 93cd31f5e60..12dc9e44ab6 100644 --- a/bin/tests/system/upforwd/ns2/named.conf.j2 +++ b/bin/tests/system/upforwd/ns2/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; allow-transfer { any; }; - recursion yes; dnssec-validation no; }; diff --git a/bin/tests/system/views/ns2/named.conf.j2 b/bin/tests/system/views/ns2/named.conf.j2 index 4bd7647dbce..3c6faccb363 100644 --- a/bin/tests/system/views/ns2/named.conf.j2 +++ b/bin/tests/system/views/ns2/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; allow-transfer { any; }; - recursion yes; dnssec-validation no; }; diff --git a/bin/tests/system/views/ns2/named2.conf.j2 b/bin/tests/system/views/ns2/named2.conf.j2 index 4499dd1fa71..3a1610af086 100644 --- a/bin/tests/system/views/ns2/named2.conf.j2 +++ b/bin/tests/system/views/ns2/named2.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.2; 10.53.0.4; }; listen-on-v6 { none; }; allow-transfer { any; }; - recursion yes; dnssec-validation no; }; diff --git a/bin/tests/system/views/ns3/named.conf.j2 b/bin/tests/system/views/ns3/named.conf.j2 index 480c3c5793b..4bf48a9105f 100644 --- a/bin/tests/system/views/ns3/named.conf.j2 +++ b/bin/tests/system/views/ns3/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; }; diff --git a/bin/tests/system/views/ns3/named2.conf.j2 b/bin/tests/system/views/ns3/named2.conf.j2 index 5609563fc1c..88610b1cbf1 100644 --- a/bin/tests/system/views/ns3/named2.conf.j2 +++ b/bin/tests/system/views/ns3/named2.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; }; diff --git a/bin/tests/system/views/ns5/named.conf.j2 b/bin/tests/system/views/ns5/named.conf.j2 index e5be3ba2c8e..81b168be31b 100644 --- a/bin/tests/system/views/ns5/named.conf.j2 +++ b/bin/tests/system/views/ns5/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.5; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; }; diff --git a/bin/tests/system/wildcard/ns2/named.conf.j2 b/bin/tests/system/wildcard/ns2/named.conf.j2 index 73f42f3aa0f..fc73e53a4f0 100644 --- a/bin/tests/system/wildcard/ns2/named.conf.j2 +++ b/bin/tests/system/wildcard/ns2/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.2; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; }; diff --git a/bin/tests/system/wildcard/ns3/named.conf.j2 b/bin/tests/system/wildcard/ns3/named.conf.j2 index 940c22b21af..db90e4f2886 100644 --- a/bin/tests/system/wildcard/ns3/named.conf.j2 +++ b/bin/tests/system/wildcard/ns3/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation yes; }; diff --git a/bin/tests/system/wildcard/ns4/named.conf.j2 b/bin/tests/system/wildcard/ns4/named.conf.j2 index 904ade5b60e..4529f724a0a 100644 --- a/bin/tests/system/wildcard/ns4/named.conf.j2 +++ b/bin/tests/system/wildcard/ns4/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.4; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation yes; forward only; forwarders { 10.53.0.2; }; diff --git a/bin/tests/system/wildcard/ns5/named.conf.j2 b/bin/tests/system/wildcard/ns5/named.conf.j2 index ba1b568a537..a76c19def50 100644 --- a/bin/tests/system/wildcard/ns5/named.conf.j2 +++ b/bin/tests/system/wildcard/ns5/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.5; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation yes; }; diff --git a/bin/tests/system/xfer/ns3/named.conf.j2 b/bin/tests/system/xfer/ns3/named.conf.j2 index d0d64afb10f..25dbbc490e1 100644 --- a/bin/tests/system/xfer/ns3/named.conf.j2 +++ b/bin/tests/system/xfer/ns3/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { none; }; allow-transfer { any; }; - recursion yes; dnssec-validation no; }; diff --git a/bin/tests/system/zero/ns3/named.conf.j2 b/bin/tests/system/zero/ns3/named.conf.j2 index 8e5ddc56b9a..b38f2157e82 100644 --- a/bin/tests/system/zero/ns3/named.conf.j2 +++ b/bin/tests/system/zero/ns3/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion yes; dnssec-validation no; servfail-ttl 0; };