From: Nicki Křížek Date: Thu, 23 Jul 2026 16:45:32 +0000 (+0000) Subject: Drop options-level notify yes statements X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=39accba92f70f2de0f2fd402966245672f5284ca;p=thirdparty%2Fbind9.git Drop options-level notify yes statements DNS NOTIFY is on by default, so an options-level `notify yes;` just restates the default. The zone- and view-level statements and non-default values are untouched. Assisted-by: Claude:claude-fable-5 --- diff --git a/bin/tests/system/acl/ns2/named.conf.j2 b/bin/tests/system/acl/ns2/named.conf.j2 index d932199a3b6..2e21dd1f2a9 100644 --- a/bin/tests/system/acl/ns2/named.conf.j2 +++ b/bin/tests/system/acl/ns2/named.conf.j2 @@ -9,7 +9,6 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion no; - notify yes; ixfr-from-differences yes; check-integrity no; dnssec-validation no; diff --git a/bin/tests/system/acl/ns2/named2.conf.j2 b/bin/tests/system/acl/ns2/named2.conf.j2 index 15d9e2f2499..46d272fd2ba 100644 --- a/bin/tests/system/acl/ns2/named2.conf.j2 +++ b/bin/tests/system/acl/ns2/named2.conf.j2 @@ -9,7 +9,6 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion no; - notify yes; ixfr-from-differences yes; check-integrity no; dnssec-validation no; diff --git a/bin/tests/system/acl/ns2/named3.conf.j2 b/bin/tests/system/acl/ns2/named3.conf.j2 index 7833044d25f..c8c1200b674 100644 --- a/bin/tests/system/acl/ns2/named3.conf.j2 +++ b/bin/tests/system/acl/ns2/named3.conf.j2 @@ -9,7 +9,6 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion no; - notify yes; ixfr-from-differences yes; check-integrity no; dnssec-validation no; diff --git a/bin/tests/system/acl/ns2/named4.conf.j2 b/bin/tests/system/acl/ns2/named4.conf.j2 index 87d3482a7c9..10b1807186b 100644 --- a/bin/tests/system/acl/ns2/named4.conf.j2 +++ b/bin/tests/system/acl/ns2/named4.conf.j2 @@ -9,7 +9,6 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion no; - notify yes; ixfr-from-differences yes; check-integrity no; dnssec-validation no; diff --git a/bin/tests/system/acl/ns2/named5.conf.j2 b/bin/tests/system/acl/ns2/named5.conf.j2 index 2e476c33598..b9c908eea33 100644 --- a/bin/tests/system/acl/ns2/named5.conf.j2 +++ b/bin/tests/system/acl/ns2/named5.conf.j2 @@ -9,7 +9,6 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion no; - notify yes; ixfr-from-differences yes; check-integrity no; dnssec-validation no; diff --git a/bin/tests/system/auth/ns1/named.conf.j2 b/bin/tests/system/auth/ns1/named.conf.j2 index 49b50163782..b31aaa1a274 100644 --- a/bin/tests/system/auth/ns1/named.conf.j2 +++ b/bin/tests/system/auth/ns1/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; - notify yes; dnssec-validation no; send-report-channel "example.rad"; }; diff --git a/bin/tests/system/auth_res_deleg/ns1/named.conf.j2 b/bin/tests/system/auth_res_deleg/ns1/named.conf.j2 index 9c0ed7e16e3..0cc901254d0 100644 --- a/bin/tests/system/auth_res_deleg/ns1/named.conf.j2 +++ b/bin/tests/system/auth_res_deleg/ns1/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; - notify yes; 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 fb5a71a7efb..e88d4bf86bd 100644 --- a/bin/tests/system/auth_res_deleg/ns2/named.conf.j2 +++ b/bin/tests/system/auth_res_deleg/ns2/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion yes; - notify yes; dnssec-validation no; dnstap { resolver query; }; dnstap-output file "dnstap.out"; diff --git a/bin/tests/system/auth_res_deleg/ns3/named.conf.j2 b/bin/tests/system/auth_res_deleg/ns3/named.conf.j2 index 6d85d35f7bc..6fad958c66b 100644 --- a/bin/tests/system/auth_res_deleg/ns3/named.conf.j2 +++ b/bin/tests/system/auth_res_deleg/ns3/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { none; }; recursion no; - notify yes; dnssec-validation no; }; diff --git a/bin/tests/system/autosign/ns1/named.conf.j2 b/bin/tests/system/autosign/ns1/named.conf.j2 index 05ec5d14798..d706707419a 100644 --- a/bin/tests/system/autosign/ns1/named.conf.j2 +++ b/bin/tests/system/autosign/ns1/named.conf.j2 @@ -10,7 +10,6 @@ options { listen-on-v6 { none; }; allow-transfer { any; }; recursion no; - notify yes; dnssec-validation yes; }; diff --git a/bin/tests/system/autosign/ns2/named.conf.j2 b/bin/tests/system/autosign/ns2/named.conf.j2 index 9ab22a0da2d..916a9d4417b 100644 --- a/bin/tests/system/autosign/ns2/named.conf.j2 +++ b/bin/tests/system/autosign/ns2/named.conf.j2 @@ -10,7 +10,6 @@ options { listen-on-v6 { none; }; allow-transfer { any; }; recursion no; - notify yes; dnssec-validation yes; dnssec-loadkeys-interval 30; }; diff --git a/bin/tests/system/autosign/ns3/named.conf.j2 b/bin/tests/system/autosign/ns3/named.conf.j2 index 08ff163a8e0..1626da48576 100644 --- a/bin/tests/system/autosign/ns3/named.conf.j2 +++ b/bin/tests/system/autosign/ns3/named.conf.j2 @@ -11,7 +11,6 @@ options { listen-on-v6 { none; }; allow-transfer { any; }; recursion no; - notify yes; dnssec-validation yes; dnssec-loadkeys-interval 10; allow-new-zones yes; diff --git a/bin/tests/system/cache_delegns/ns1/named.conf.j2 b/bin/tests/system/cache_delegns/ns1/named.conf.j2 index 3d2d80c19ff..a17cb870904 100644 --- a/bin/tests/system/cache_delegns/ns1/named.conf.j2 +++ b/bin/tests/system/cache_delegns/ns1/named.conf.j2 @@ -10,7 +10,6 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { fd92:7065:b8e:ffff::1; }; recursion no; - notify yes; dnssec-validation no; }; diff --git a/bin/tests/system/cacheclean/ns1/named.conf.j2 b/bin/tests/system/cacheclean/ns1/named.conf.j2 index f85984516f1..598f3c35d31 100644 --- a/bin/tests/system/cacheclean/ns1/named.conf.j2 +++ b/bin/tests/system/cacheclean/ns1/named.conf.j2 @@ -9,7 +9,6 @@ options { allow-transfer { any; }; recursion no; dnssec-validation no; - notify yes; check-integrity no; minimal-responses no; }; diff --git a/bin/tests/system/cacheclean/ns2/named.conf.j2 b/bin/tests/system/cacheclean/ns2/named.conf.j2 index 1b9e51273fd..827bb20bf5e 100644 --- a/bin/tests/system/cacheclean/ns2/named.conf.j2 +++ b/bin/tests/system/cacheclean/ns2/named.conf.j2 @@ -6,7 +6,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.2; }; listen-on-v6 { none; }; - notify yes; disable-empty-zone 127.IN-ADDR.ARPA; recursion yes; dnssec-validation no; diff --git a/bin/tests/system/cacheclean/ns3/named.conf.j2 b/bin/tests/system/cacheclean/ns3/named.conf.j2 index 09aa76dfcf9..38f813c1322 100644 --- a/bin/tests/system/cacheclean/ns3/named.conf.j2 +++ b/bin/tests/system/cacheclean/ns3/named.conf.j2 @@ -9,7 +9,6 @@ options { allow-transfer { any; }; recursion no; dnssec-validation no; - notify yes; check-integrity no; minimal-responses no; }; diff --git a/bin/tests/system/camp/ns1/named.conf.j2 b/bin/tests/system/camp/ns1/named.conf.j2 index ca214d5f921..9f6d74fdbe8 100644 --- a/bin/tests/system/camp/ns1/named.conf.j2 +++ b/bin/tests/system/camp/ns1/named.conf.j2 @@ -9,7 +9,6 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; - notify yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/camp/ns2/named.conf.j2 b/bin/tests/system/camp/ns2/named.conf.j2 index 4b3a05a5cdb..76d2db22ef5 100644 --- a/bin/tests/system/camp/ns2/named.conf.j2 +++ b/bin/tests/system/camp/ns2/named.conf.j2 @@ -9,7 +9,6 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion no; - notify yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/case/ns1/named.conf.j2 b/bin/tests/system/case/ns1/named.conf.j2 index 873733f2291..5600daac5b3 100644 --- a/bin/tests/system/case/ns1/named.conf.j2 +++ b/bin/tests/system/case/ns1/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; allow-transfer { any; }; recursion no; - notify yes; ixfr-from-differences yes; check-integrity no; minimal-responses no; diff --git a/bin/tests/system/case/ns2/named.conf.j2 b/bin/tests/system/case/ns2/named.conf.j2 index 85bb3753bf5..11a111cd34c 100644 --- a/bin/tests/system/case/ns2/named.conf.j2 +++ b/bin/tests/system/case/ns2/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; allow-transfer { any; }; recursion no; - notify yes; ixfr-from-differences yes; check-integrity no; no-case-compress { 10.53.0.2; }; diff --git a/bin/tests/system/chain/ns1/named.conf.j2 b/bin/tests/system/chain/ns1/named.conf.j2 index 81eaf4c9a22..738186cf027 100644 --- a/bin/tests/system/chain/ns1/named.conf.j2 +++ b/bin/tests/system/chain/ns1/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion no; dnssec-validation no; - notify yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/chain/ns2/named.conf.j2 b/bin/tests/system/chain/ns2/named.conf.j2 index 98ce052d16b..2521e21951e 100644 --- a/bin/tests/system/chain/ns2/named.conf.j2 +++ b/bin/tests/system/chain/ns2/named.conf.j2 @@ -10,7 +10,6 @@ options { listen-on-v6 { none; }; recursion no; dnssec-validation no; - notify yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/chain/ns5/named.conf.j2 b/bin/tests/system/chain/ns5/named.conf.j2 index 47adb9926f0..d0888a8ca69 100644 --- a/bin/tests/system/chain/ns5/named.conf.j2 +++ b/bin/tests/system/chain/ns5/named.conf.j2 @@ -10,7 +10,6 @@ options { listen-on-v6 { none; }; recursion no; dnssec-validation no; - notify yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/chase_ds/ns1/named.conf.j2 b/bin/tests/system/chase_ds/ns1/named.conf.j2 index b2126e0f77a..647a42d8b7c 100644 --- a/bin/tests/system/chase_ds/ns1/named.conf.j2 +++ b/bin/tests/system/chase_ds/ns1/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; - notify yes; dnssec-validation yes; }; diff --git a/bin/tests/system/chase_ds/ns2/named.conf.j2 b/bin/tests/system/chase_ds/ns2/named.conf.j2 index 17086676a90..a74025b1922 100644 --- a/bin/tests/system/chase_ds/ns2/named.conf.j2 +++ b/bin/tests/system/chase_ds/ns2/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion no; - notify yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/checkds/ns1/named.conf.j2 b/bin/tests/system/checkds/ns1/named.conf.j2 index 4a858d5fc78..63222df496c 100644 --- a/bin/tests/system/checkds/ns1/named.conf.j2 +++ b/bin/tests/system/checkds/ns1/named.conf.j2 @@ -9,7 +9,6 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; - notify yes; dnssec-validation no; }; diff --git a/bin/tests/system/checknames/ns1/named.conf.j2 b/bin/tests/system/checknames/ns1/named.conf.j2 index a50be2c4904..5587e65956a 100644 --- a/bin/tests/system/checknames/ns1/named.conf.j2 +++ b/bin/tests/system/checknames/ns1/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion no; dnssec-validation no; - notify yes; check-integrity no; }; diff --git a/bin/tests/system/checknames/ns2/named.conf.j2 b/bin/tests/system/checknames/ns2/named.conf.j2 index 0bddeee2350..1cf12dba38f 100644 --- a/bin/tests/system/checknames/ns2/named.conf.j2 +++ b/bin/tests/system/checknames/ns2/named.conf.j2 @@ -9,7 +9,6 @@ options { recursion yes; dnssec-validation no; check-names response warn; - notify yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/checknames/ns3/named.conf.j2 b/bin/tests/system/checknames/ns3/named.conf.j2 index 4631725c478..4d214bff00a 100644 --- a/bin/tests/system/checknames/ns3/named.conf.j2 +++ b/bin/tests/system/checknames/ns3/named.conf.j2 @@ -9,7 +9,6 @@ options { recursion yes; dnssec-validation no; check-names response fail; - notify yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/checknames/ns4/named.conf.j2 b/bin/tests/system/checknames/ns4/named.conf.j2 index f87d60ca49b..f14d011c77e 100644 --- a/bin/tests/system/checknames/ns4/named.conf.j2 +++ b/bin/tests/system/checknames/ns4/named.conf.j2 @@ -11,7 +11,6 @@ options { dnssec-validation no; check-names primary ignore; check-names secondary ignore; - notify yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/checknames/ns5/named.conf.j2 b/bin/tests/system/checknames/ns5/named.conf.j2 index d0a89a74342..8cb67b99722 100644 --- a/bin/tests/system/checknames/ns5/named.conf.j2 +++ b/bin/tests/system/checknames/ns5/named.conf.j2 @@ -11,7 +11,6 @@ options { dnssec-validation no; check-names master ignore; check-names slave ignore; - notify yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/cyclic_glue/ns1/named.conf.j2 b/bin/tests/system/cyclic_glue/ns1/named.conf.j2 index 83f0b18acd8..bcc8b544238 100644 --- a/bin/tests/system/cyclic_glue/ns1/named.conf.j2 +++ b/bin/tests/system/cyclic_glue/ns1/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; - notify yes; dnssec-validation no; }; diff --git a/bin/tests/system/cyclic_glue/ns2/named.conf.j2 b/bin/tests/system/cyclic_glue/ns2/named.conf.j2 index 6b913d96587..351c53a7be1 100644 --- a/bin/tests/system/cyclic_glue/ns2/named.conf.j2 +++ b/bin/tests/system/cyclic_glue/ns2/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion no; - notify yes; dnssec-validation no; minimal-responses no; }; diff --git a/bin/tests/system/cyclic_glue/ns3/named.conf.j2 b/bin/tests/system/cyclic_glue/ns3/named.conf.j2 index 0d081ec8c6f..d8dbea28299 100644 --- a/bin/tests/system/cyclic_glue/ns3/named.conf.j2 +++ b/bin/tests/system/cyclic_glue/ns3/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { none; }; recursion no; - notify yes; dnssec-validation no; }; diff --git a/bin/tests/system/database/ns1/named.conf.j2 b/bin/tests/system/database/ns1/named.conf.j2 index 1df289aa7cf..0da97250d65 100644 --- a/bin/tests/system/database/ns1/named.conf.j2 +++ b/bin/tests/system/database/ns1/named.conf.j2 @@ -11,7 +11,6 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; - notify yes; dnssec-validation no; }; diff --git a/bin/tests/system/digdelv/ns1/named.conf.j2 b/bin/tests/system/digdelv/ns1/named.conf.j2 index 4cb673a1f13..c22baaf2103 100644 --- a/bin/tests/system/digdelv/ns1/named.conf.j2 +++ b/bin/tests/system/digdelv/ns1/named.conf.j2 @@ -12,7 +12,6 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { fd92:7065:b8e:ffff::1; }; recursion no; - notify yes; dnssec-validation no; }; diff --git a/bin/tests/system/dlzexternal/ns1/named.conf.j2 b/bin/tests/system/dlzexternal/ns1/named.conf.j2 index 9b053f04cac..19e9c634551 100644 --- a/bin/tests/system/dlzexternal/ns1/named.conf.j2 +++ b/bin/tests/system/dlzexternal/ns1/named.conf.j2 @@ -9,7 +9,6 @@ options { listen-on-v6 { none; }; allow-transfer { !10.53.0.1; any; }; recursion no; - notify yes; dnssec-validation no; }; diff --git a/bin/tests/system/dns64/ns1/named.conf.j2 b/bin/tests/system/dns64/ns1/named.conf.j2 index 2467b3f686c..67b8047b057 100644 --- a/bin/tests/system/dns64/ns1/named.conf.j2 +++ b/bin/tests/system/dns64/ns1/named.conf.j2 @@ -13,7 +13,6 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; allow-recursion { 10.53.0.1; }; - notify yes; dnssec-validation no; dns64 2001:bbbb::/96 { diff --git a/bin/tests/system/dns64/ns1/named2.conf.j2 b/bin/tests/system/dns64/ns1/named2.conf.j2 index cccfe349bda..9199422234b 100644 --- a/bin/tests/system/dns64/ns1/named2.conf.j2 +++ b/bin/tests/system/dns64/ns1/named2.conf.j2 @@ -13,7 +13,6 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; allow-recursion { 10.53.0.1; }; - notify yes; dnssec-validation no; dns64 2001:bbbb::/96 { diff --git a/bin/tests/system/dns64/ns1/named3.conf.j2 b/bin/tests/system/dns64/ns1/named3.conf.j2 index 237ff6a7122..77b9ed04035 100644 --- a/bin/tests/system/dns64/ns1/named3.conf.j2 +++ b/bin/tests/system/dns64/ns1/named3.conf.j2 @@ -13,7 +13,6 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; allow-recursion { 10.53.0.1; }; - notify yes; dnssec-validation no; }; diff --git a/bin/tests/system/dns64/ns2/named.conf.j2 b/bin/tests/system/dns64/ns2/named.conf.j2 index 38ede07c096..791a15b0924 100644 --- a/bin/tests/system/dns64/ns2/named.conf.j2 +++ b/bin/tests/system/dns64/ns2/named.conf.j2 @@ -11,7 +11,6 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion yes; - notify yes; dnssec-validation no; dns64 2001:aaaa::/96 { diff --git a/bin/tests/system/dns64/ns3/named.conf.j2 b/bin/tests/system/dns64/ns3/named.conf.j2 index 96bef6e0809..861ec834f7a 100644 --- a/bin/tests/system/dns64/ns3/named.conf.j2 +++ b/bin/tests/system/dns64/ns3/named.conf.j2 @@ -15,7 +15,6 @@ options { listen-on port @PORT@ { 10.53.0.3; }; // for start.pl listen-on { 10.53.0.3; }; listen-on-v6 { fd92:7065:b8e:ffff::3; }; - notify yes; dnssec-validation no; allow-recursion { any; }; resolver-use-dns64 yes; diff --git a/bin/tests/system/dns64/ns4/named.conf.j2 b/bin/tests/system/dns64/ns4/named.conf.j2 index 0e461df50dd..699af379637 100644 --- a/bin/tests/system/dns64/ns4/named.conf.j2 +++ b/bin/tests/system/dns64/ns4/named.conf.j2 @@ -12,7 +12,6 @@ options { pid-file "named.pid"; listen-on port @PORT@ { 10.53.0.4; }; // for start.pl listen-on-v6 { fd92:7065:b8e:fffe::10.53.0.4; }; - notify yes; dnssec-validation no; recursion no; }; diff --git a/bin/tests/system/dnssec/ns1/named.conf.j2 b/bin/tests/system/dnssec/ns1/named.conf.j2 index 6e444773751..cd8c180962f 100644 --- a/bin/tests/system/dnssec/ns1/named.conf.j2 +++ b/bin/tests/system/dnssec/ns1/named.conf.j2 @@ -11,7 +11,6 @@ options { minimal-any no; minimal-responses no; recursion no; - notify yes; dnssec-validation yes; /* test that we can turn off trust-anchor-telemetry */ trust-anchor-telemetry no; diff --git a/bin/tests/system/dnssec/ns2/named.conf.j2 b/bin/tests/system/dnssec/ns2/named.conf.j2 index 947d9e29a9a..db989e26982 100644 --- a/bin/tests/system/dnssec/ns2/named.conf.j2 +++ b/bin/tests/system/dnssec/ns2/named.conf.j2 @@ -12,7 +12,6 @@ options { minimal-any no; minimal-responses no; recursion no; - notify yes; dnssec-validation yes; notify-delay 1; }; diff --git a/bin/tests/system/dnssec/ns3/named.conf.j2 b/bin/tests/system/dnssec/ns3/named.conf.j2 index 32ece18c4bc..18420416c48 100644 --- a/bin/tests/system/dnssec/ns3/named.conf.j2 +++ b/bin/tests/system/dnssec/ns3/named.conf.j2 @@ -14,7 +14,6 @@ options { minimal-any no; minimal-responses yes; recursion no; - notify yes; dnssec-validation yes; session-keyfile "session.key"; }; diff --git a/bin/tests/system/dnssec/ns6/named.conf.j2 b/bin/tests/system/dnssec/ns6/named.conf.j2 index 79d0be40f9a..d5fe26700a8 100644 --- a/bin/tests/system/dnssec/ns6/named.conf.j2 +++ b/bin/tests/system/dnssec/ns6/named.conf.j2 @@ -10,7 +10,6 @@ options { listen-on-v6 { none; }; minimal-any no; recursion yes; - notify yes; disable-algorithms . { @ALTERNATIVE_ALGORITHM@; }; dnssec-validation yes; }; diff --git a/bin/tests/system/dnstap/ns1/named.conf.j2 b/bin/tests/system/dnstap/ns1/named.conf.j2 index c97733947f6..7473b63c4ac 100644 --- a/bin/tests/system/dnstap/ns1/named.conf.j2 +++ b/bin/tests/system/dnstap/ns1/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; - notify yes; statistics-file "named.stats"; dnstap-identity "ns1"; dnstap-version "xxx"; diff --git a/bin/tests/system/dnstap/ns2/named.conf.j2 b/bin/tests/system/dnstap/ns2/named.conf.j2 index 2ff7d5bd65b..edf9c9d381a 100644 --- a/bin/tests/system/dnstap/ns2/named.conf.j2 +++ b/bin/tests/system/dnstap/ns2/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion yes; - notify 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 445c5eaca61..b6d4341a27c 100644 --- a/bin/tests/system/dnstap/ns3/named.conf.j2 +++ b/bin/tests/system/dnstap/ns3/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { none; }; recursion yes; - notify 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 deae8a2b719..686b0f992df 100644 --- a/bin/tests/system/dnstap/ns4/named.conf.j2 +++ b/bin/tests/system/dnstap/ns4/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.4; }; listen-on-v6 { none; }; recursion yes; - notify 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 c9d428c99cf..823df5d8fd5 100644 --- a/bin/tests/system/dnstap/ns5/named.conf.j2 +++ b/bin/tests/system/dnstap/ns5/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.5; }; listen-on-v6 { none; }; recursion yes; - notify yes; dnstap-identity "ns5"; dnstap-version "xxx"; dnstap-output file "dnstap.out"; diff --git a/bin/tests/system/dsdigest/ns1/named.conf.j2 b/bin/tests/system/dsdigest/ns1/named.conf.j2 index 8cf3b7ff3af..f283359d738 100644 --- a/bin/tests/system/dsdigest/ns1/named.conf.j2 +++ b/bin/tests/system/dsdigest/ns1/named.conf.j2 @@ -11,7 +11,6 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; - notify yes; dnssec-validation yes; }; diff --git a/bin/tests/system/dsdigest/ns2/named.conf.j2 b/bin/tests/system/dsdigest/ns2/named.conf.j2 index 7567b78dbb6..72d4939f175 100644 --- a/bin/tests/system/dsdigest/ns2/named.conf.j2 +++ b/bin/tests/system/dsdigest/ns2/named.conf.j2 @@ -11,7 +11,6 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion no; - notify yes; dnssec-validation yes; }; diff --git a/bin/tests/system/dyndb/ns1/named.conf.j2 b/bin/tests/system/dyndb/ns1/named.conf.j2 index 7740ad64eb3..7e229f3bb31 100644 --- a/bin/tests/system/dyndb/ns1/named.conf.j2 +++ b/bin/tests/system/dyndb/ns1/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on { 10.53.0.1; 127.0.0.1; }; listen-on-v6 { none; }; recursion no; - notify yes; dnssec-validation no; }; diff --git a/bin/tests/system/ecdsa/ns1/named.conf.j2 b/bin/tests/system/ecdsa/ns1/named.conf.j2 index 8cf3b7ff3af..f283359d738 100644 --- a/bin/tests/system/ecdsa/ns1/named.conf.j2 +++ b/bin/tests/system/ecdsa/ns1/named.conf.j2 @@ -11,7 +11,6 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; - notify yes; dnssec-validation yes; }; diff --git a/bin/tests/system/ecdsa/ns2/named.conf.j2 b/bin/tests/system/ecdsa/ns2/named.conf.j2 index eb2404657d7..08b2479fca0 100644 --- a/bin/tests/system/ecdsa/ns2/named.conf.j2 +++ b/bin/tests/system/ecdsa/ns2/named.conf.j2 @@ -11,7 +11,6 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion yes; - notify 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 381484dfb70..c65d9b276ca 100644 --- a/bin/tests/system/ecdsa/ns3/named.conf.j2 +++ b/bin/tests/system/ecdsa/ns3/named.conf.j2 @@ -11,7 +11,6 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { none; }; recursion yes; - notify yes; dnssec-validation yes; }; diff --git a/bin/tests/system/eddsa/ns1/named.conf.j2 b/bin/tests/system/eddsa/ns1/named.conf.j2 index 8cf3b7ff3af..f283359d738 100644 --- a/bin/tests/system/eddsa/ns1/named.conf.j2 +++ b/bin/tests/system/eddsa/ns1/named.conf.j2 @@ -11,7 +11,6 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; - notify 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 eb2404657d7..08b2479fca0 100644 --- a/bin/tests/system/eddsa/ns2/named.conf.j2 +++ b/bin/tests/system/eddsa/ns2/named.conf.j2 @@ -11,7 +11,6 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion yes; - notify 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 381484dfb70..c65d9b276ca 100644 --- a/bin/tests/system/eddsa/ns3/named.conf.j2 +++ b/bin/tests/system/eddsa/ns3/named.conf.j2 @@ -11,7 +11,6 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { none; }; recursion yes; - notify yes; dnssec-validation yes; }; diff --git a/bin/tests/system/fetchlimit/ns1/named.conf.j2 b/bin/tests/system/fetchlimit/ns1/named.conf.j2 index c68ddd0467a..d1b6dd85824 100644 --- a/bin/tests/system/fetchlimit/ns1/named.conf.j2 +++ b/bin/tests/system/fetchlimit/ns1/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion no; dnssec-validation no; - notify yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/fetchlimit/ns2/named.conf.j2 b/bin/tests/system/fetchlimit/ns2/named.conf.j2 index f85b068980a..6f5e7da2963 100644 --- a/bin/tests/system/fetchlimit/ns2/named.conf.j2 +++ b/bin/tests/system/fetchlimit/ns2/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion no; dnssec-validation no; - notify yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/fetchlimit/ns3/named.conf.j2 b/bin/tests/system/fetchlimit/ns3/named.conf.j2 index 81322d29042..7caef38eb5e 100644 --- a/bin/tests/system/fetchlimit/ns3/named.conf.j2 +++ b/bin/tests/system/fetchlimit/ns3/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion yes; dnssec-validation no; - notify yes; 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 8fa446cc16a..c0d00b34424 100644 --- a/bin/tests/system/fetchlimit/ns3/named2.conf.j2 +++ b/bin/tests/system/fetchlimit/ns3/named2.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion yes; dnssec-validation no; - notify yes; 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 cfaba22ce97..286f3f3ac3f 100644 --- a/bin/tests/system/fetchlimit/ns3/named3.conf.j2 +++ b/bin/tests/system/fetchlimit/ns3/named3.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion yes; dnssec-validation no; - notify yes; recursive-clients 400; }; diff --git a/bin/tests/system/fetchlimit/ns5/named.conf.j2 b/bin/tests/system/fetchlimit/ns5/named.conf.j2 index bacbd874d95..db52f6059c2 100644 --- a/bin/tests/system/fetchlimit/ns5/named.conf.j2 +++ b/bin/tests/system/fetchlimit/ns5/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion yes; dnssec-validation no; - notify yes; 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 dd4afae11e2..e82e049ba66 100644 --- a/bin/tests/system/fetchlimit/ns5/named2.conf.j2 +++ b/bin/tests/system/fetchlimit/ns5/named2.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion yes; dnssec-validation no; - notify yes; stale-answer-enable yes; stale-cache-enable yes; stale-answer-client-timeout 0; diff --git a/bin/tests/system/fetchlimit/ns5/named3.conf.j2 b/bin/tests/system/fetchlimit/ns5/named3.conf.j2 index f74fb3619d2..255014b49f8 100644 --- a/bin/tests/system/fetchlimit/ns5/named3.conf.j2 +++ b/bin/tests/system/fetchlimit/ns5/named3.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion yes; dnssec-validation no; - notify yes; stale-answer-enable yes; stale-cache-enable yes; stale-answer-client-timeout 0; diff --git a/bin/tests/system/filters/ns1/named.conf.j2 b/bin/tests/system/filters/ns1/named.conf.j2 index 9d5019b93ca..7c69544cad7 100644 --- a/bin/tests/system/filters/ns1/named.conf.j2 +++ b/bin/tests/system/filters/ns1/named.conf.j2 @@ -14,7 +14,6 @@ options { listen-on-v6 { fd92:7065:b8e:ffff::1; }; recursion no; dnssec-validation no; - notify yes; minimal-responses no; }; diff --git a/bin/tests/system/filters/ns2/named.conf.j2 b/bin/tests/system/filters/ns2/named.conf.j2 index e58160d02e3..c7dcb992001 100644 --- a/bin/tests/system/filters/ns2/named.conf.j2 +++ b/bin/tests/system/filters/ns2/named.conf.j2 @@ -14,7 +14,6 @@ options { listen-on-v6 { fd92:7065:b8e:ffff::2; }; recursion yes; dnssec-validation yes; - notify 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 4803d3631e2..ebfd5e7e8d1 100644 --- a/bin/tests/system/filters/ns3/named.conf.j2 +++ b/bin/tests/system/filters/ns3/named.conf.j2 @@ -14,7 +14,6 @@ options { listen-on-v6 { fd92:7065:b8e:ffff::3; }; recursion yes; dnssec-validation yes; - notify yes; minimal-responses no; }; diff --git a/bin/tests/system/filters/ns4/named.conf.j2 b/bin/tests/system/filters/ns4/named.conf.j2 index 6f3a3f327a2..7068eb10b38 100644 --- a/bin/tests/system/filters/ns4/named.conf.j2 +++ b/bin/tests/system/filters/ns4/named.conf.j2 @@ -14,7 +14,6 @@ options { listen-on-v6 { fd92:7065:b8e:ffff::4; }; recursion no; dnssec-validation no; - notify 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 821450422dc..1c9cfeb8834 100644 --- a/bin/tests/system/filters/ns5/named.conf.j2 +++ b/bin/tests/system/filters/ns5/named.conf.j2 @@ -11,7 +11,6 @@ options { listen-on-v6 { fd92:7065:b8e:ffff::5; }; recursion yes; dnssec-validation no; - notify yes; dns64 64:ff9b::/96 { clients { any; }; exclude { ::1/128; }; diff --git a/bin/tests/system/hooks/ns1/named.conf.j2 b/bin/tests/system/hooks/ns1/named.conf.j2 index 50388ca2df5..52328b14ce3 100644 --- a/bin/tests/system/hooks/ns1/named.conf.j2 +++ b/bin/tests/system/hooks/ns1/named.conf.j2 @@ -10,7 +10,6 @@ options { listen-on-v6 { none; }; recursion no; dnssec-validation no; - notify yes; minimal-responses no; }; diff --git a/bin/tests/system/hooks/ns2/named.conf.j2 b/bin/tests/system/hooks/ns2/named.conf.j2 index 50342376993..c93eb283328 100644 --- a/bin/tests/system/hooks/ns2/named.conf.j2 +++ b/bin/tests/system/hooks/ns2/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion no; dnssec-validation yes; - notify yes; minimal-responses no; }; diff --git a/bin/tests/system/idna/ns1/named.conf.j2 b/bin/tests/system/idna/ns1/named.conf.j2 index 4cb673a1f13..c22baaf2103 100644 --- a/bin/tests/system/idna/ns1/named.conf.j2 +++ b/bin/tests/system/idna/ns1/named.conf.j2 @@ -12,7 +12,6 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { fd92:7065:b8e:ffff::1; }; recursion no; - notify yes; dnssec-validation no; }; diff --git a/bin/tests/system/inline/ns1/named.conf.j2 b/bin/tests/system/inline/ns1/named.conf.j2 index 06cb694e9e3..5fd586624b6 100644 --- a/bin/tests/system/inline/ns1/named.conf.j2 +++ b/bin/tests/system/inline/ns1/named.conf.j2 @@ -12,7 +12,6 @@ options { listen-on-v6 { none; }; allow-transfer { any; }; recursion no; - notify yes; dnssec-validation yes; }; diff --git a/bin/tests/system/inline/ns2/named.conf.j2 b/bin/tests/system/inline/ns2/named.conf.j2 index 03375a12761..97189bae039 100644 --- a/bin/tests/system/inline/ns2/named.conf.j2 +++ b/bin/tests/system/inline/ns2/named.conf.j2 @@ -12,7 +12,6 @@ options { listen-on-v6 { none; }; allow-transfer { any; }; recursion no; - notify yes; notify-delay 0; allow-new-zones yes; dnssec-validation no; diff --git a/bin/tests/system/inline/ns3/named.conf.j2 b/bin/tests/system/inline/ns3/named.conf.j2 index 279bea76269..0e4e1836373 100644 --- a/bin/tests/system/inline/ns3/named.conf.j2 +++ b/bin/tests/system/inline/ns3/named.conf.j2 @@ -12,7 +12,6 @@ options { listen-on-v6 { none; }; recursion no; allow-transfer { any; }; - notify yes; try-tcp-refresh no; notify-delay 0; allow-new-zones yes; diff --git a/bin/tests/system/inline/ns4/named.conf.j2 b/bin/tests/system/inline/ns4/named.conf.j2 index f20f7807b32..3aac0658899 100644 --- a/bin/tests/system/inline/ns4/named.conf.j2 +++ b/bin/tests/system/inline/ns4/named.conf.j2 @@ -10,7 +10,6 @@ options { listen-on-v6 { none; }; allow-transfer { any; }; recursion no; - notify yes; notify-delay 0; dnssec-validation no; }; diff --git a/bin/tests/system/inline/ns5/named.conf.j2 b/bin/tests/system/inline/ns5/named.conf.j2 index 4f547ecaedc..71b05a4d457 100644 --- a/bin/tests/system/inline/ns5/named.conf.j2 +++ b/bin/tests/system/inline/ns5/named.conf.j2 @@ -12,7 +12,6 @@ options { listen-on-v6 { none; }; dnssec-validation no; recursion no; - notify yes; notify-delay 0; }; diff --git a/bin/tests/system/inline/ns5/named2.conf.j2 b/bin/tests/system/inline/ns5/named2.conf.j2 index 6b0578c2a35..8283a54c1de 100644 --- a/bin/tests/system/inline/ns5/named2.conf.j2 +++ b/bin/tests/system/inline/ns5/named2.conf.j2 @@ -12,7 +12,6 @@ options { listen-on-v6 { none; }; dnssec-validation no; recursion no; - notify yes; notify-delay 0; servfail-ttl 0; }; diff --git a/bin/tests/system/inline/ns6/named.conf.j2 b/bin/tests/system/inline/ns6/named.conf.j2 index a780bdb5f27..4541b170eda 100644 --- a/bin/tests/system/inline/ns6/named.conf.j2 +++ b/bin/tests/system/inline/ns6/named.conf.j2 @@ -11,7 +11,6 @@ options { listen-on { 10.53.0.6; }; listen-on-v6 { none; }; recursion yes; - notify yes; notify-delay 0; dnssec-validation yes; }; diff --git a/bin/tests/system/inline/ns8/named.conf.j2 b/bin/tests/system/inline/ns8/named.conf.j2 index 153ec12f1fe..03a116a57ec 100644 --- a/bin/tests/system/inline/ns8/named.conf.j2 +++ b/bin/tests/system/inline/ns8/named.conf.j2 @@ -12,7 +12,6 @@ options { listen-on { 10.53.0.8; }; listen-on-v6 { none; }; recursion no; - notify yes; try-tcp-refresh no; notify-delay 0; allow-new-zones yes; diff --git a/bin/tests/system/integrity/ns1/named.conf.j2 b/bin/tests/system/integrity/ns1/named.conf.j2 index 134fda0e628..f4fe79f430c 100644 --- a/bin/tests/system/integrity/ns1/named.conf.j2 +++ b/bin/tests/system/integrity/ns1/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; - notify yes; ixfr-from-differences yes; check-integrity no; dnssec-validation no; diff --git a/bin/tests/system/ixfr/ns1/named.conf.j2 b/bin/tests/system/ixfr/ns1/named.conf.j2 index d9808cfc692..4f7b29c9858 100644 --- a/bin/tests/system/ixfr/ns1/named.conf.j2 +++ b/bin/tests/system/ixfr/ns1/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; allow-transfer { any; }; recursion no; - notify yes; dnssec-validation no; }; diff --git a/bin/tests/system/ixfr/ns3/named.conf.j2 b/bin/tests/system/ixfr/ns3/named.conf.j2 index fe940bd24af..474375416d6 100644 --- a/bin/tests/system/ixfr/ns3/named.conf.j2 +++ b/bin/tests/system/ixfr/ns3/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { none; }; recursion no; - notify yes; dnssec-validation no; }; diff --git a/bin/tests/system/ixfr/ns4/named.conf.j2 b/bin/tests/system/ixfr/ns4/named.conf.j2 index 6a7c8cc9065..0b7c5c009cb 100644 --- a/bin/tests/system/ixfr/ns4/named.conf.j2 +++ b/bin/tests/system/ixfr/ns4/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; allow-transfer { any; }; recursion no; - notify yes; dnssec-validation no; }; diff --git a/bin/tests/system/ixfr/ns5/named.conf.j2 b/bin/tests/system/ixfr/ns5/named.conf.j2 index 5e8dafa626b..80ce8a28ecc 100644 --- a/bin/tests/system/ixfr/ns5/named.conf.j2 +++ b/bin/tests/system/ixfr/ns5/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; allow-transfer { any; }; recursion no; - notify yes; provide-ixfr no; dnssec-validation no; }; diff --git a/bin/tests/system/journal/ns1/named.conf.j2 b/bin/tests/system/journal/ns1/named.conf.j2 index 2390c495a71..16a92ad5fe2 100644 --- a/bin/tests/system/journal/ns1/named.conf.j2 +++ b/bin/tests/system/journal/ns1/named.conf.j2 @@ -10,7 +10,6 @@ options { dnssec-validation auto; minimal-responses no; recursion no; - notify yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/journal/ns2/named.conf.j2 b/bin/tests/system/journal/ns2/named.conf.j2 index 6d7daf1ad11..b22f6fd370e 100644 --- a/bin/tests/system/journal/ns2/named.conf.j2 +++ b/bin/tests/system/journal/ns2/named.conf.j2 @@ -10,7 +10,6 @@ options { dnssec-validation auto; minimal-responses no; recursion no; - notify yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/kasp/ns1/named.conf.j2 b/bin/tests/system/kasp/ns1/named.conf.j2 index d99ee3c39b3..fc603c9e18d 100644 --- a/bin/tests/system/kasp/ns1/named.conf.j2 +++ b/bin/tests/system/kasp/ns1/named.conf.j2 @@ -9,7 +9,6 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; - notify yes; allow-transfer { any; }; }; diff --git a/bin/tests/system/keepalive/ns1/named.conf.j2 b/bin/tests/system/keepalive/ns1/named.conf.j2 index 9c0ed7e16e3..0cc901254d0 100644 --- a/bin/tests/system/keepalive/ns1/named.conf.j2 +++ b/bin/tests/system/keepalive/ns1/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; - notify yes; dnssec-validation no; }; diff --git a/bin/tests/system/keepalive/ns3/named.conf.j2 b/bin/tests/system/keepalive/ns3/named.conf.j2 index f6e3198d9c4..9048c38ea21 100644 --- a/bin/tests/system/keepalive/ns3/named.conf.j2 +++ b/bin/tests/system/keepalive/ns3/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { none; }; recursion yes; - notify yes; dnssec-validation no; }; diff --git a/bin/tests/system/limits/ns1/named.conf.j2 b/bin/tests/system/limits/ns1/named.conf.j2 index ebf502dae5f..c9dfa410a96 100644 --- a/bin/tests/system/limits/ns1/named.conf.j2 +++ b/bin/tests/system/limits/ns1/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; - notify yes; minimal-responses no; dnssec-validation no; max-records-per-type 0; diff --git a/bin/tests/system/logfileconfig/ns1/named.abspath.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.abspath.conf.j2 index 5bccc24571b..4e81f26d082 100644 --- a/bin/tests/system/logfileconfig/ns1/named.abspath.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.abspath.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; dnssec-validation no; recursion no; - notify yes; }; logging { diff --git a/bin/tests/system/logfileconfig/ns1/named.dir.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.dir.conf.j2 index 540f7c6c7e3..cb25c10c58e 100644 --- a/bin/tests/system/logfileconfig/ns1/named.dir.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.dir.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; dnssec-validation no; recursion no; - notify yes; }; logging { diff --git a/bin/tests/system/logfileconfig/ns1/named.inc.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.inc.conf.j2 index 1e79c7e251b..415c9ad1f5b 100644 --- a/bin/tests/system/logfileconfig/ns1/named.inc.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.inc.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; dnssec-validation no; recursion no; - notify yes; }; logging { diff --git a/bin/tests/system/logfileconfig/ns1/named.iso8601-utc.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.iso8601-utc.conf.j2 index b4100057bc7..2131bb0c4cb 100644 --- a/bin/tests/system/logfileconfig/ns1/named.iso8601-utc.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.iso8601-utc.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; dnssec-validation no; recursion no; - notify yes; }; logging { diff --git a/bin/tests/system/logfileconfig/ns1/named.iso8601.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.iso8601.conf.j2 index dce68370518..427609862fa 100644 --- a/bin/tests/system/logfileconfig/ns1/named.iso8601.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.iso8601.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; dnssec-validation no; recursion no; - notify yes; }; logging { diff --git a/bin/tests/system/logfileconfig/ns1/named.pipe.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.pipe.conf.j2 index 373109c09a6..d4dd9c607fd 100644 --- a/bin/tests/system/logfileconfig/ns1/named.pipe.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.pipe.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; dnssec-validation no; recursion no; - notify yes; }; logging { diff --git a/bin/tests/system/logfileconfig/ns1/named.plain.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.plain.conf.j2 index 3d878ae6517..20116e380ed 100644 --- a/bin/tests/system/logfileconfig/ns1/named.plain.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.plain.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; dnssec-validation no; recursion no; - notify yes; }; logging { diff --git a/bin/tests/system/logfileconfig/ns1/named.plainlog.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.plainlog.conf.j2 index 127f6c6624d..5980f7e4966 100644 --- a/bin/tests/system/logfileconfig/ns1/named.plainlog.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.plainlog.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; dnssec-validation no; recursion no; - notify yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/logfileconfig/ns1/named.sym.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.sym.conf.j2 index 19f85e49b5e..1ede6c1f512 100644 --- a/bin/tests/system/logfileconfig/ns1/named.sym.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.sym.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; dnssec-validation no; recursion no; - notify yes; }; logging { diff --git a/bin/tests/system/logfileconfig/ns1/named.ts.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.ts.conf.j2 index fc0dc2e1abd..33feb6d9beb 100644 --- a/bin/tests/system/logfileconfig/ns1/named.ts.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.ts.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; dnssec-validation no; recursion no; - notify yes; }; logging { diff --git a/bin/tests/system/logfileconfig/ns1/named.unlimited.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.unlimited.conf.j2 index 1193fd99c3e..aafd275f29f 100644 --- a/bin/tests/system/logfileconfig/ns1/named.unlimited.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.unlimited.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; dnssec-validation no; recursion no; - notify yes; }; logging { diff --git a/bin/tests/system/logfileconfig/ns1/named.vers.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.vers.conf.j2 index 011fb6fe4b0..6350c251057 100644 --- a/bin/tests/system/logfileconfig/ns1/named.vers.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.vers.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; dnssec-validation no; recursion no; - notify yes; }; logging { diff --git a/bin/tests/system/masterfile/ns1/named.conf.j2 b/bin/tests/system/masterfile/ns1/named.conf.j2 index 8e9b7b01dc2..469dab78c47 100644 --- a/bin/tests/system/masterfile/ns1/named.conf.j2 +++ b/bin/tests/system/masterfile/ns1/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; allow-transfer { any; }; recursion no; - notify yes; dnssec-validation no; }; diff --git a/bin/tests/system/masterfile/ns2/named.conf.j2 b/bin/tests/system/masterfile/ns2/named.conf.j2 index 0653e1b987a..464cbde1189 100644 --- a/bin/tests/system/masterfile/ns2/named.conf.j2 +++ b/bin/tests/system/masterfile/ns2/named.conf.j2 @@ -10,7 +10,6 @@ options { listen-on-v6 { none; }; allow-transfer { any; }; recursion no; - notify yes; dnssec-validation no; }; diff --git a/bin/tests/system/minimalresponses/ns1/named.conf.j2 b/bin/tests/system/minimalresponses/ns1/named.conf.j2 index a5621430562..fd2ee857681 100644 --- a/bin/tests/system/minimalresponses/ns1/named.conf.j2 +++ b/bin/tests/system/minimalresponses/ns1/named.conf.j2 @@ -9,7 +9,6 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; - notify yes; minimal-responses @minresp@; }; diff --git a/bin/tests/system/minimalresponses/ns2/named.conf.j2 b/bin/tests/system/minimalresponses/ns2/named.conf.j2 index 22fd505ff75..8367e1eae46 100644 --- a/bin/tests/system/minimalresponses/ns2/named.conf.j2 +++ b/bin/tests/system/minimalresponses/ns2/named.conf.j2 @@ -9,7 +9,6 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion no; - notify yes; dnssec-validation no; minimal-responses @minresp@; }; diff --git a/bin/tests/system/minimalresponses/ns3/named.conf.j2 b/bin/tests/system/minimalresponses/ns3/named.conf.j2 index ddb8c4c7212..08d92b123c1 100644 --- a/bin/tests/system/minimalresponses/ns3/named.conf.j2 +++ b/bin/tests/system/minimalresponses/ns3/named.conf.j2 @@ -9,7 +9,6 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { none; }; recursion yes; - notify 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 75c52c18e98..a7565018fe5 100644 --- a/bin/tests/system/minimalresponses/ns4/named.conf.j2 +++ b/bin/tests/system/minimalresponses/ns4/named.conf.j2 @@ -9,7 +9,6 @@ options { listen-on { 10.53.0.4; }; listen-on-v6 { none; }; recursion yes; - notify yes; dnssec-validation no; minimal-responses @minresp@; }; diff --git a/bin/tests/system/multisigner/ns1/named.conf.j2 b/bin/tests/system/multisigner/ns1/named.conf.j2 index dacf753f207..eccb9fa2d3c 100644 --- a/bin/tests/system/multisigner/ns1/named.conf.j2 +++ b/bin/tests/system/multisigner/ns1/named.conf.j2 @@ -9,7 +9,6 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; - notify yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/names/ns1/named.conf.j2 b/bin/tests/system/names/ns1/named.conf.j2 index b97647f5719..5f4045e7cee 100644 --- a/bin/tests/system/names/ns1/named.conf.j2 +++ b/bin/tests/system/names/ns1/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; - notify yes; ixfr-from-differences yes; check-integrity no; dnssec-validation no; diff --git a/bin/tests/system/notify/ns1/named.conf.j2 b/bin/tests/system/notify/ns1/named.conf.j2 index ca9e1b81d88..115f59ee887 100644 --- a/bin/tests/system/notify/ns1/named.conf.j2 +++ b/bin/tests/system/notify/ns1/named.conf.j2 @@ -9,7 +9,6 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; - notify yes; dnssec-validation no; }; diff --git a/bin/tests/system/notify/ns2/named.conf.j2 b/bin/tests/system/notify/ns2/named.conf.j2 index 3a1e738d8b2..684f9f16bc8 100644 --- a/bin/tests/system/notify/ns2/named.conf.j2 +++ b/bin/tests/system/notify/ns2/named.conf.j2 @@ -13,7 +13,6 @@ options { listen-on-v6 { none; }; allow-transfer { any; }; recursion no; - notify yes; startup-notify-rate 5; dnssec-validation no; diff --git a/bin/tests/system/notify/ns3/named.conf.j2 b/bin/tests/system/notify/ns3/named.conf.j2 index 577136c7ff1..024c64a61ca 100644 --- a/bin/tests/system/notify/ns3/named.conf.j2 +++ b/bin/tests/system/notify/ns3/named.conf.j2 @@ -14,7 +14,6 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { fd92:7065:b8e:ffff::3; }; recursion yes; - notify 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 99306c65b36..741b28acc62 100644 --- a/bin/tests/system/notify/ns4/named.conf.j2 +++ b/bin/tests/system/notify/ns4/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; allow-transfer { any; }; recursion yes; - notify 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 8979a067bfa..b157da6237e 100644 --- a/bin/tests/system/notify/ns5/named.conf.j2 +++ b/bin/tests/system/notify/ns5/named.conf.j2 @@ -23,7 +23,6 @@ options { listen-on-v6 { none; }; allow-transfer { any; }; recursion yes; - notify yes; dnssec-validation no; }; diff --git a/bin/tests/system/nsec/ns1/named.conf.j2 b/bin/tests/system/nsec/ns1/named.conf.j2 index 49dbe6cbeab..07a1de53def 100644 --- a/bin/tests/system/nsec/ns1/named.conf.j2 +++ b/bin/tests/system/nsec/ns1/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; - notify yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/nsec/ns2/named.conf.j2 b/bin/tests/system/nsec/ns2/named.conf.j2 index 1a41313ddfa..bf56e7ee777 100644 --- a/bin/tests/system/nsec/ns2/named.conf.j2 +++ b/bin/tests/system/nsec/ns2/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion no; - notify yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/nsec_ixfr/ns1/named.conf.j2 b/bin/tests/system/nsec_ixfr/ns1/named.conf.j2 index 7604769f092..fcd565149e0 100644 --- a/bin/tests/system/nsec_ixfr/ns1/named.conf.j2 +++ b/bin/tests/system/nsec_ixfr/ns1/named.conf.j2 @@ -10,7 +10,6 @@ options { listen-on-v6 { none; }; allow-transfer { any; }; recursion no; - notify yes; dnssec-validation no; }; diff --git a/bin/tests/system/nsec_ixfr/ns2/named.conf.j2 b/bin/tests/system/nsec_ixfr/ns2/named.conf.j2 index 0e857c9d16d..62f7af3d5d2 100644 --- a/bin/tests/system/nsec_ixfr/ns2/named.conf.j2 +++ b/bin/tests/system/nsec_ixfr/ns2/named.conf.j2 @@ -9,7 +9,6 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion no; - notify yes; dnssec-validation no; }; diff --git a/bin/tests/system/nsec_piggyback/ns2/named.conf.j2 b/bin/tests/system/nsec_piggyback/ns2/named.conf.j2 index 85e37ab8099..8a3892d1fb9 100644 --- a/bin/tests/system/nsec_piggyback/ns2/named.conf.j2 +++ b/bin/tests/system/nsec_piggyback/ns2/named.conf.j2 @@ -12,7 +12,6 @@ options { minimal-any no; minimal-responses no; recursion no; - notify yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/nsupdate/ns1/named.conf.j2 b/bin/tests/system/nsupdate/ns1/named.conf.j2 index 22b697ce5bf..925a546681a 100644 --- a/bin/tests/system/nsupdate/ns1/named.conf.j2 +++ b/bin/tests/system/nsupdate/ns1/named.conf.j2 @@ -12,7 +12,6 @@ options { listen-on { 10.53.0.1; 127.0.0.1; }; listen-on-v6 { none; }; recursion no; - notify yes; minimal-responses no; update-quota 1; dnssec-validation no; diff --git a/bin/tests/system/nsupdate/ns10/named.conf.j2 b/bin/tests/system/nsupdate/ns10/named.conf.j2 index 467c35edb4d..1ac4f6dfbeb 100644 --- a/bin/tests/system/nsupdate/ns10/named.conf.j2 +++ b/bin/tests/system/nsupdate/ns10/named.conf.j2 @@ -10,7 +10,6 @@ options { listen-on tls ephemeral { 10.53.0.10; }; listen-on-v6 { none; }; recursion no; - notify yes; minimal-responses no; dnssec-validation no; tkey-gssapi-keytab "dns.keytab"; diff --git a/bin/tests/system/nsupdate/ns2/named.conf.j2 b/bin/tests/system/nsupdate/ns2/named.conf.j2 index e28dd033088..a9f1f0281c1 100644 --- a/bin/tests/system/nsupdate/ns2/named.conf.j2 +++ b/bin/tests/system/nsupdate/ns2/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion yes; - notify yes; serial-query-rate 1; // workaround for KB AA-01213 dnssec-validation no; }; diff --git a/bin/tests/system/nsupdate/ns3/named.conf.j2 b/bin/tests/system/nsupdate/ns3/named.conf.j2 index 3111c03f96a..29724fe1d97 100644 --- a/bin/tests/system/nsupdate/ns3/named.conf.j2 +++ b/bin/tests/system/nsupdate/ns3/named.conf.j2 @@ -9,7 +9,6 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { none; }; recursion no; - notify yes; dnssec-validation no; }; diff --git a/bin/tests/system/nsupdate/ns5/named.conf.j2 b/bin/tests/system/nsupdate/ns5/named.conf.j2 index 8115eac5d12..3fc8db03708 100644 --- a/bin/tests/system/nsupdate/ns5/named.conf.j2 +++ b/bin/tests/system/nsupdate/ns5/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on { 10.53.0.5; }; listen-on-v6 { none; }; recursion no; - notify yes; minimal-responses no; dnssec-validation no; }; diff --git a/bin/tests/system/nsupdate/ns6/named.conf.j2 b/bin/tests/system/nsupdate/ns6/named.conf.j2 index d8fe3293ab3..41ade5b2aa5 100644 --- a/bin/tests/system/nsupdate/ns6/named.conf.j2 +++ b/bin/tests/system/nsupdate/ns6/named.conf.j2 @@ -11,7 +11,6 @@ options { listen-on { 10.53.0.6; }; listen-on-v6 { fd92:7065:b8e:ffff::6; }; recursion no; - notify yes; minimal-responses no; dnssec-validation no; }; diff --git a/bin/tests/system/nsupdate/ns7/named.conf.j2 b/bin/tests/system/nsupdate/ns7/named.conf.j2 index 72a46df764e..9f986a5bb41 100644 --- a/bin/tests/system/nsupdate/ns7/named.conf.j2 +++ b/bin/tests/system/nsupdate/ns7/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on { 10.53.0.7; }; listen-on-v6 { none; }; recursion no; - notify yes; minimal-responses no; dnssec-validation no; }; diff --git a/bin/tests/system/nsupdate/ns7/named2.conf.j2 b/bin/tests/system/nsupdate/ns7/named2.conf.j2 index 930013bb766..a799536ff8d 100644 --- a/bin/tests/system/nsupdate/ns7/named2.conf.j2 +++ b/bin/tests/system/nsupdate/ns7/named2.conf.j2 @@ -8,7 +8,6 @@ options { listen-on { 10.53.0.7; }; listen-on-v6 { none; }; recursion no; - notify yes; minimal-responses no; dnssec-validation no; tkey-gssapi-keytab "dns.keytab"; diff --git a/bin/tests/system/nsupdate/ns8/named.conf.j2 b/bin/tests/system/nsupdate/ns8/named.conf.j2 index bf3d1329665..bf811f7c18a 100644 --- a/bin/tests/system/nsupdate/ns8/named.conf.j2 +++ b/bin/tests/system/nsupdate/ns8/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on { 10.53.0.8; }; listen-on-v6 { none; }; recursion no; - notify yes; minimal-responses no; dnssec-validation no; tkey-gssapi-keytab "dns-other-than-KRB5_KTNAME.keytab"; diff --git a/bin/tests/system/nsupdate/ns9/named.conf.j2 b/bin/tests/system/nsupdate/ns9/named.conf.j2 index a615322e23e..f50b4a52a16 100644 --- a/bin/tests/system/nsupdate/ns9/named.conf.j2 +++ b/bin/tests/system/nsupdate/ns9/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on { 10.53.0.9; }; listen-on-v6 { none; }; recursion no; - notify yes; minimal-responses no; dnssec-validation no; tkey-gssapi-keytab "dns.keytab"; diff --git a/bin/tests/system/nta/ns1/named.conf.j2 b/bin/tests/system/nta/ns1/named.conf.j2 index 04d6f7dfbb4..0249014a635 100644 --- a/bin/tests/system/nta/ns1/named.conf.j2 +++ b/bin/tests/system/nta/ns1/named.conf.j2 @@ -9,7 +9,6 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; - notify yes; dnssec-validation yes; /* test that we can turn off trust-anchor-telemetry */ trust-anchor-telemetry no; diff --git a/bin/tests/system/nta/ns2/named.conf.j2 b/bin/tests/system/nta/ns2/named.conf.j2 index 848524e21e9..f2d0182279b 100644 --- a/bin/tests/system/nta/ns2/named.conf.j2 +++ b/bin/tests/system/nta/ns2/named.conf.j2 @@ -10,7 +10,6 @@ options { listen-on-v6 { none; }; allow-transfer { any; }; recursion no; - notify yes; notify-delay 1; dnssec-validation no; minimal-responses no; diff --git a/bin/tests/system/nta/ns3/named.conf.j2 b/bin/tests/system/nta/ns3/named.conf.j2 index a1359acc916..9af076aefb0 100644 --- a/bin/tests/system/nta/ns3/named.conf.j2 +++ b/bin/tests/system/nta/ns3/named.conf.j2 @@ -10,7 +10,6 @@ options { listen-on-v6 { none; }; allow-transfer { any; }; recursion no; - notify yes; dnssec-validation no; minimal-responses no; }; diff --git a/bin/tests/system/padding/ns1/named.conf.j2 b/bin/tests/system/padding/ns1/named.conf.j2 index 9c0ed7e16e3..0cc901254d0 100644 --- a/bin/tests/system/padding/ns1/named.conf.j2 +++ b/bin/tests/system/padding/ns1/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; - notify yes; dnssec-validation no; }; diff --git a/bin/tests/system/padding/ns3/named.conf.j2 b/bin/tests/system/padding/ns3/named.conf.j2 index 3bfe1c05957..6f221378dd8 100644 --- a/bin/tests/system/padding/ns3/named.conf.j2 +++ b/bin/tests/system/padding/ns3/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { none; }; recursion yes; - notify 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 76466da797f..141f05071dc 100644 --- a/bin/tests/system/padding/ns4/named.conf.j2 +++ b/bin/tests/system/padding/ns4/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.4; }; listen-on-v6 { none; }; recursion yes; - notify yes; dnssec-validation no; }; diff --git a/bin/tests/system/pending/ns2/named.conf.j2 b/bin/tests/system/pending/ns2/named.conf.j2 index 139b79936c1..f7d805741a7 100644 --- a/bin/tests/system/pending/ns2/named.conf.j2 +++ b/bin/tests/system/pending/ns2/named.conf.j2 @@ -11,7 +11,6 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion no; - notify yes; dnssec-validation yes; }; diff --git a/bin/tests/system/pipelined/ns1/named.conf.j2 b/bin/tests/system/pipelined/ns1/named.conf.j2 index 8d7b125a0c7..0cc901254d0 100644 --- a/bin/tests/system/pipelined/ns1/named.conf.j2 +++ b/bin/tests/system/pipelined/ns1/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion no; dnssec-validation no; - notify yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/pipelined/ns2/named.conf.j2 b/bin/tests/system/pipelined/ns2/named.conf.j2 index e3a578e805d..65dfc25385f 100644 --- a/bin/tests/system/pipelined/ns2/named.conf.j2 +++ b/bin/tests/system/pipelined/ns2/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion yes; dnssec-validation no; - notify yes; }; diff --git a/bin/tests/system/pipelined/ns3/named.conf.j2 b/bin/tests/system/pipelined/ns3/named.conf.j2 index 3a8d312dfcf..198125806eb 100644 --- a/bin/tests/system/pipelined/ns3/named.conf.j2 +++ b/bin/tests/system/pipelined/ns3/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion yes; dnssec-validation no; - notify yes; }; diff --git a/bin/tests/system/pipelined/ns4/named.conf.j2 b/bin/tests/system/pipelined/ns4/named.conf.j2 index 341db8150b7..b5a0f2de7d2 100644 --- a/bin/tests/system/pipelined/ns4/named.conf.j2 +++ b/bin/tests/system/pipelined/ns4/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion yes; dnssec-validation no; - notify yes; }; diff --git a/bin/tests/system/qmin/ns1/named.conf.j2 b/bin/tests/system/qmin/ns1/named.conf.j2 index 22c124ba0f2..7542ace9237 100644 --- a/bin/tests/system/qmin/ns1/named.conf.j2 +++ b/bin/tests/system/qmin/ns1/named.conf.j2 @@ -9,7 +9,6 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; - notify yes; dnssec-validation no; }; diff --git a/bin/tests/system/randomizens/ns1/named.conf.j2 b/bin/tests/system/randomizens/ns1/named.conf.j2 index 49dbe6cbeab..07a1de53def 100644 --- a/bin/tests/system/randomizens/ns1/named.conf.j2 +++ b/bin/tests/system/randomizens/ns1/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; - notify yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/randomizens/ns2/named.conf.j2 b/bin/tests/system/randomizens/ns2/named.conf.j2 index 914a589b129..c90ca4a92b8 100644 --- a/bin/tests/system/randomizens/ns2/named.conf.j2 +++ b/bin/tests/system/randomizens/ns2/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion no; - notify yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/randomizens/ns3/named.conf.j2 b/bin/tests/system/randomizens/ns3/named.conf.j2 index 95fdb19ac96..042f5d9e589 100644 --- a/bin/tests/system/randomizens/ns3/named.conf.j2 +++ b/bin/tests/system/randomizens/ns3/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { none; }; recursion no; - notify yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/randomizens/ns4/named.conf.j2 b/bin/tests/system/randomizens/ns4/named.conf.j2 index 279b45e6896..a5b2bfd1f64 100644 --- a/bin/tests/system/randomizens/ns4/named.conf.j2 +++ b/bin/tests/system/randomizens/ns4/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.4; }; listen-on-v6 { none; }; recursion no; - notify yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/randomizens/ns5/named.conf.j2 b/bin/tests/system/randomizens/ns5/named.conf.j2 index e7d0d370123..ca2976322d8 100644 --- a/bin/tests/system/randomizens/ns5/named.conf.j2 +++ b/bin/tests/system/randomizens/ns5/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.5; }; listen-on-v6 { none; }; recursion no; - notify yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/redirect/ns1/named.conf.j2 b/bin/tests/system/redirect/ns1/named.conf.j2 index e402dde16a5..fbc72562184 100644 --- a/bin/tests/system/redirect/ns1/named.conf.j2 +++ b/bin/tests/system/redirect/ns1/named.conf.j2 @@ -11,7 +11,6 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; allow-recursion { 10.53.0.1; }; - notify yes; dnssec-validation no; }; diff --git a/bin/tests/system/redirect/ns2/named.conf.j2 b/bin/tests/system/redirect/ns2/named.conf.j2 index 08e2fdc5d89..1546e9acdc5 100644 --- a/bin/tests/system/redirect/ns2/named.conf.j2 +++ b/bin/tests/system/redirect/ns2/named.conf.j2 @@ -11,7 +11,6 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion yes; - notify yes; dnssec-validation no; }; diff --git a/bin/tests/system/redirect/ns3/named.conf.j2 b/bin/tests/system/redirect/ns3/named.conf.j2 index 72992a5f50a..a92d2cf63e8 100644 --- a/bin/tests/system/redirect/ns3/named.conf.j2 +++ b/bin/tests/system/redirect/ns3/named.conf.j2 @@ -9,7 +9,6 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { none; }; allow-recursion { 10.53.0.3; }; - notify 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 b6c0b663f66..a8a9691a398 100644 --- a/bin/tests/system/redirect/ns4/named.conf.j2 +++ b/bin/tests/system/redirect/ns4/named.conf.j2 @@ -11,7 +11,6 @@ options { listen-on { 10.53.0.4; }; listen-on-v6 { none; }; recursion yes; - notify yes; dnssec-validation no; nxdomain-redirect "redirect"; }; diff --git a/bin/tests/system/rollover/ns1/named.conf.j2 b/bin/tests/system/rollover/ns1/named.conf.j2 index 6822276f08d..f50e6320928 100644 --- a/bin/tests/system/rollover/ns1/named.conf.j2 +++ b/bin/tests/system/rollover/ns1/named.conf.j2 @@ -9,7 +9,6 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; - notify yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/rootkeysentinel/ns1/named.conf.j2 b/bin/tests/system/rootkeysentinel/ns1/named.conf.j2 index b2126e0f77a..647a42d8b7c 100644 --- a/bin/tests/system/rootkeysentinel/ns1/named.conf.j2 +++ b/bin/tests/system/rootkeysentinel/ns1/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; - notify yes; dnssec-validation yes; }; diff --git a/bin/tests/system/rootkeysentinel/ns2/named.conf.j2 b/bin/tests/system/rootkeysentinel/ns2/named.conf.j2 index 3450bbd7c50..d6cc29764be 100644 --- a/bin/tests/system/rootkeysentinel/ns2/named.conf.j2 +++ b/bin/tests/system/rootkeysentinel/ns2/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion no; - notify yes; dnssec-validation yes; }; diff --git a/bin/tests/system/rootkeysentinel/ns3/named.conf.j2 b/bin/tests/system/rootkeysentinel/ns3/named.conf.j2 index b1d5efa246f..19a2a339558 100644 --- a/bin/tests/system/rootkeysentinel/ns3/named.conf.j2 +++ b/bin/tests/system/rootkeysentinel/ns3/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { none; }; recursion yes; - notify 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 81c6648918d..49e7591ae1a 100644 --- a/bin/tests/system/rootkeysentinel/ns4/named.conf.j2 +++ b/bin/tests/system/rootkeysentinel/ns4/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.4; }; listen-on-v6 { none; }; recursion yes; - notify yes; dnssec-validation yes; root-key-sentinel no; }; diff --git a/bin/tests/system/rpz/ns3/named.conf.j2 b/bin/tests/system/rpz/ns3/named.conf.j2 index 69a383e679c..bd9ccf9c344 100644 --- a/bin/tests/system/rpz/ns3/named.conf.j2 +++ b/bin/tests/system/rpz/ns3/named.conf.j2 @@ -15,7 +15,6 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { none; }; allow-transfer { any; }; - notify yes; minimal-any no; minimal-responses no; recursion yes; diff --git a/bin/tests/system/rpz/ns5/named.conf.j2 b/bin/tests/system/rpz/ns5/named.conf.j2 index 4fcde4b29c9..887803d0595 100644 --- a/bin/tests/system/rpz/ns5/named.conf.j2 +++ b/bin/tests/system/rpz/ns5/named.conf.j2 @@ -15,7 +15,6 @@ options { allow-transfer { any; }; ixfr-from-differences yes; notify-delay 0; - notify yes; minimal-any no; minimal-responses no; recursion yes; diff --git a/bin/tests/system/rpz/ns8/named.conf.j2 b/bin/tests/system/rpz/ns8/named.conf.j2 index 253b60885e0..585f7b18095 100644 --- a/bin/tests/system/rpz/ns8/named.conf.j2 +++ b/bin/tests/system/rpz/ns8/named.conf.j2 @@ -13,7 +13,6 @@ options { listen-on { 10.53.0.8; }; listen-on-v6 { none; }; allow-transfer { any; }; - notify yes; minimal-any no; minimal-responses no; recursion yes; diff --git a/bin/tests/system/rpz/ns9/named.conf.j2 b/bin/tests/system/rpz/ns9/named.conf.j2 index 3e871cea05c..518ea7b62cb 100644 --- a/bin/tests/system/rpz/ns9/named.conf.j2 +++ b/bin/tests/system/rpz/ns9/named.conf.j2 @@ -13,7 +13,6 @@ options { listen-on { 10.53.0.9; }; listen-on-v6 { none; }; allow-transfer { any; }; - notify yes; minimal-any no; minimal-responses no; recursion yes; diff --git a/bin/tests/system/rrsetorder/ns2/named.conf.j2 b/bin/tests/system/rrsetorder/ns2/named.conf.j2 index 99f77d8e174..547cc74b777 100644 --- a/bin/tests/system/rrsetorder/ns2/named.conf.j2 +++ b/bin/tests/system/rrsetorder/ns2/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion no; dnssec-validation no; - notify yes; rrset-order { name "random.example" order random; name "cyclic.example" order cyclic; diff --git a/bin/tests/system/rrsetorder/ns3/named.conf.j2 b/bin/tests/system/rrsetorder/ns3/named.conf.j2 index 0f45d2ccaa9..b99aff2d8eb 100644 --- a/bin/tests/system/rrsetorder/ns3/named.conf.j2 +++ b/bin/tests/system/rrsetorder/ns3/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion yes; dnssec-validation no; - notify yes; rrset-order { name "random.example" order random; name "cyclic.example" order cyclic; diff --git a/bin/tests/system/rrsetorder/ns4/named.conf.j2 b/bin/tests/system/rrsetorder/ns4/named.conf.j2 index 3a246084f4a..642af44c879 100644 --- a/bin/tests/system/rrsetorder/ns4/named.conf.j2 +++ b/bin/tests/system/rrsetorder/ns4/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion yes; dnssec-validation no; - notify yes; 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 84355fe4f58..7a3b5db1611 100644 --- a/bin/tests/system/rrsetorder/ns5/named.conf.j2 +++ b/bin/tests/system/rrsetorder/ns5/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion yes; dnssec-validation no; - notify yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/rsabigexponent/ns1/named.conf.j2 b/bin/tests/system/rsabigexponent/ns1/named.conf.j2 index 166e79fa1d4..574e74486e3 100644 --- a/bin/tests/system/rsabigexponent/ns1/named.conf.j2 +++ b/bin/tests/system/rsabigexponent/ns1/named.conf.j2 @@ -9,7 +9,6 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; - notify yes; dnssec-validation yes; }; diff --git a/bin/tests/system/rsabigexponent/ns2/named.conf.j2 b/bin/tests/system/rsabigexponent/ns2/named.conf.j2 index 128b3c42870..a277ea34fe5 100644 --- a/bin/tests/system/rsabigexponent/ns2/named.conf.j2 +++ b/bin/tests/system/rsabigexponent/ns2/named.conf.j2 @@ -9,7 +9,6 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion no; - notify yes; dnssec-validation no; }; diff --git a/bin/tests/system/runtime/ns2/named1.conf.j2 b/bin/tests/system/runtime/ns2/named1.conf.j2 index e8498fe9be9..8c7f5164a49 100644 --- a/bin/tests/system/runtime/ns2/named1.conf.j2 +++ b/bin/tests/system/runtime/ns2/named1.conf.j2 @@ -12,7 +12,6 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { fd92:7065:b8e:ffff::2; }; recursion no; - notify yes; dnssec-validation no; }; diff --git a/bin/tests/system/sfcache/ns1/named.conf.j2 b/bin/tests/system/sfcache/ns1/named.conf.j2 index 166e79fa1d4..574e74486e3 100644 --- a/bin/tests/system/sfcache/ns1/named.conf.j2 +++ b/bin/tests/system/sfcache/ns1/named.conf.j2 @@ -9,7 +9,6 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; - notify yes; dnssec-validation yes; }; diff --git a/bin/tests/system/sfcache/ns2/named.conf.j2 b/bin/tests/system/sfcache/ns2/named.conf.j2 index c1a19196ca6..981015fa8fa 100644 --- a/bin/tests/system/sfcache/ns2/named.conf.j2 +++ b/bin/tests/system/sfcache/ns2/named.conf.j2 @@ -9,7 +9,6 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion no; - notify yes; dnssec-validation yes; }; diff --git a/bin/tests/system/showconf/ns1/named.conf.j2 b/bin/tests/system/showconf/ns1/named.conf.j2 index 5d21133484e..0ff6b9658d9 100644 --- a/bin/tests/system/showconf/ns1/named.conf.j2 +++ b/bin/tests/system/showconf/ns1/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion no; dnssec-validation no; - notify yes; minimal-responses no; allow-new-zones yes; }; diff --git a/bin/tests/system/spf/ns1/named.conf.j2 b/bin/tests/system/spf/ns1/named.conf.j2 index a0a410d24b9..ce17ddc43bb 100644 --- a/bin/tests/system/spf/ns1/named.conf.j2 +++ b/bin/tests/system/spf/ns1/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion no; dnssec-validation no; - notify yes; ixfr-from-differences yes; }; diff --git a/bin/tests/system/srtt/ns1/named.conf.j2 b/bin/tests/system/srtt/ns1/named.conf.j2 index 248175c337c..0135d55f12b 100644 --- a/bin/tests/system/srtt/ns1/named.conf.j2 +++ b/bin/tests/system/srtt/ns1/named.conf.j2 @@ -20,7 +20,6 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; - notify yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/statistics/ns1/named.conf.j2 b/bin/tests/system/statistics/ns1/named.conf.j2 index ed0ede2af33..942028944ba 100644 --- a/bin/tests/system/statistics/ns1/named.conf.j2 +++ b/bin/tests/system/statistics/ns1/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion no; dnssec-validation no; - notify yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/statistics/ns2/named1.conf.j2 b/bin/tests/system/statistics/ns2/named1.conf.j2 index dff7ed6f963..aafc3b384a2 100644 --- a/bin/tests/system/statistics/ns2/named1.conf.j2 +++ b/bin/tests/system/statistics/ns2/named1.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion yes; dnssec-validation no; - notify yes; }; {% if FEATURE_LIBXML2 == "1" or FEATURE_JSON_C == "1" %} diff --git a/bin/tests/system/statistics/ns2/named2.conf.j2 b/bin/tests/system/statistics/ns2/named2.conf.j2 index fd29305b1d4..337caa9829c 100644 --- a/bin/tests/system/statistics/ns2/named2.conf.j2 +++ b/bin/tests/system/statistics/ns2/named2.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion yes; dnssec-validation no; - notify yes; }; {% if FEATURE_LIBXML2 == "1" or FEATURE_JSON_C == "1" %} diff --git a/bin/tests/system/statistics/ns3/named.conf.j2 b/bin/tests/system/statistics/ns3/named.conf.j2 index 1d1b1c9ac7f..141afea01e4 100644 --- a/bin/tests/system/statistics/ns3/named.conf.j2 +++ b/bin/tests/system/statistics/ns3/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion yes; dnssec-validation no; - notify yes; qname-minimization disabled; zone-statistics yes; }; diff --git a/bin/tests/system/stress/ns2/named.conf.j2 b/bin/tests/system/stress/ns2/named.conf.j2 index cd47702373d..6f11045dc6e 100644 --- a/bin/tests/system/stress/ns2/named.conf.j2 +++ b/bin/tests/system/stress/ns2/named.conf.j2 @@ -10,7 +10,6 @@ options { listen-on-v6 { none; }; recursion no; dnssec-validation no; - notify yes; }; zone "zone000000.example" { diff --git a/bin/tests/system/stress/ns3/named.conf.j2 b/bin/tests/system/stress/ns3/named.conf.j2 index e9591d3c086..d5a1d01b96b 100644 --- a/bin/tests/system/stress/ns3/named.conf.j2 +++ b/bin/tests/system/stress/ns3/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion yes; dnssec-validation no; - notify yes; }; diff --git a/bin/tests/system/stress/ns4/named.conf.j2 b/bin/tests/system/stress/ns4/named.conf.j2 index 92a527165c7..337ebd0b723 100644 --- a/bin/tests/system/stress/ns4/named.conf.j2 +++ b/bin/tests/system/stress/ns4/named.conf.j2 @@ -10,7 +10,6 @@ options { listen-on-v6 { none; }; recursion yes; dnssec-validation no; - notify yes; }; diff --git a/bin/tests/system/stub/ns1/named.conf.j2 b/bin/tests/system/stub/ns1/named.conf.j2 index 8da1242510e..d59f79bfbe7 100644 --- a/bin/tests/system/stub/ns1/named.conf.j2 +++ b/bin/tests/system/stub/ns1/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion no; dnssec-validation no; - notify yes; minimal-responses no; }; diff --git a/bin/tests/system/stub/ns2/named.conf.j2 b/bin/tests/system/stub/ns2/named.conf.j2 index 46d7c78de69..376ec060035 100644 --- a/bin/tests/system/stub/ns2/named.conf.j2 +++ b/bin/tests/system/stub/ns2/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion no; dnssec-validation no; - notify yes; minimal-responses no; }; diff --git a/bin/tests/system/stub/ns3/named.conf.j2 b/bin/tests/system/stub/ns3/named.conf.j2 index 8812ebd602d..132b4e568a1 100644 --- a/bin/tests/system/stub/ns3/named.conf.j2 +++ b/bin/tests/system/stub/ns3/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion yes; dnssec-validation no; - notify yes; minimal-responses no; }; diff --git a/bin/tests/system/stub/ns4/named.conf.j2 b/bin/tests/system/stub/ns4/named.conf.j2 index 83aee968275..181e678a729 100644 --- a/bin/tests/system/stub/ns4/named.conf.j2 +++ b/bin/tests/system/stub/ns4/named.conf.j2 @@ -7,7 +7,6 @@ options { listen-on { 10.53.0.4; }; listen-on-v6 { none; }; recursion no; - notify yes; minimal-responses yes; dnssec-validation no; }; diff --git a/bin/tests/system/synthfromdnssec/ns1/named.conf.j2 b/bin/tests/system/synthfromdnssec/ns1/named.conf.j2 index 91e20e857f7..24c1ce2d58c 100644 --- a/bin/tests/system/synthfromdnssec/ns1/named.conf.j2 +++ b/bin/tests/system/synthfromdnssec/ns1/named.conf.j2 @@ -9,7 +9,6 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; - notify yes; dnssec-validation yes; }; diff --git a/bin/tests/system/tcp/ns1/named.conf.j2 b/bin/tests/system/tcp/ns1/named.conf.j2 index d32286482e3..021594d3f46 100644 --- a/bin/tests/system/tcp/ns1/named.conf.j2 +++ b/bin/tests/system/tcp/ns1/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion no; dnssec-validation no; - notify yes; statistics-file "named.stats"; }; diff --git a/bin/tests/system/tcp/ns2/named.conf.j2 b/bin/tests/system/tcp/ns2/named.conf.j2 index 1c59af9b72f..72d62d4cca4 100644 --- a/bin/tests/system/tcp/ns2/named.conf.j2 +++ b/bin/tests/system/tcp/ns2/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion yes; dnssec-validation no; - notify yes; 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 75d72b9ea4e..2c625665a5f 100644 --- a/bin/tests/system/tcp/ns3/named.conf.j2 +++ b/bin/tests/system/tcp/ns3/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion yes; dnssec-validation no; - notify yes; }; server 10.53.0.1 { tcp-only yes; }; diff --git a/bin/tests/system/tcp/ns4/named.conf.j2 b/bin/tests/system/tcp/ns4/named.conf.j2 index 6b947893abb..ffab39fa1fa 100644 --- a/bin/tests/system/tcp/ns4/named.conf.j2 +++ b/bin/tests/system/tcp/ns4/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion yes; dnssec-validation no; - notify yes; 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 19fe63c9c44..e533baba41f 100644 --- a/bin/tests/system/tcp/ns5/named.conf.j2 +++ b/bin/tests/system/tcp/ns5/named.conf.j2 @@ -13,7 +13,6 @@ options { listen-on-v6 { none; }; tcp-listen-queue 32; recursion yes; - notify yes; tcp-clients 17; dnssec-validation no; }; diff --git a/bin/tests/system/tcp/ns7/named.conf.j2 b/bin/tests/system/tcp/ns7/named.conf.j2 index d942dcc16f7..f8feba57604 100644 --- a/bin/tests/system/tcp/ns7/named.conf.j2 +++ b/bin/tests/system/tcp/ns7/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion no; dnssec-validation no; - notify yes; statistics-file "named.stats"; tcp-clients 1; }; diff --git a/bin/tests/system/tsiggss/ns1/named.conf.j2 b/bin/tests/system/tsiggss/ns1/named.conf.j2 index d9c434b2064..ebc690af5b5 100644 --- a/bin/tests/system/tsiggss/ns1/named.conf.j2 +++ b/bin/tests/system/tsiggss/ns1/named.conf.j2 @@ -9,7 +9,6 @@ options { listen-on-v6 { none; }; recursion no; dnssec-validation no; - notify yes; tkey-gssapi-keytab "dns.keytab"; }; diff --git a/bin/tests/system/upforwd/ns1/named.conf.j2 b/bin/tests/system/upforwd/ns1/named.conf.j2 index a729ecfc974..5ef6c58d0df 100644 --- a/bin/tests/system/upforwd/ns1/named.conf.j2 +++ b/bin/tests/system/upforwd/ns1/named.conf.j2 @@ -16,7 +16,6 @@ options { allow-transfer { any; }; recursion yes; dnssec-validation no; - notify yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/upforwd/ns2/named.conf.j2 b/bin/tests/system/upforwd/ns2/named.conf.j2 index b247793bfaf..93cd31f5e60 100644 --- a/bin/tests/system/upforwd/ns2/named.conf.j2 +++ b/bin/tests/system/upforwd/ns2/named.conf.j2 @@ -9,7 +9,6 @@ options { allow-transfer { any; }; recursion yes; dnssec-validation no; - notify yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/upforwd/ns3/named.conf.j2 b/bin/tests/system/upforwd/ns3/named.conf.j2 index 98cad6f8e06..be60b296811 100644 --- a/bin/tests/system/upforwd/ns3/named.conf.j2 +++ b/bin/tests/system/upforwd/ns3/named.conf.j2 @@ -11,7 +11,6 @@ options { allow-transfer { any; }; recursion no; dnssec-validation no; - notify yes; include "dnstap.conf"; }; diff --git a/bin/tests/system/upforwd/ns3/named2.conf.j2 b/bin/tests/system/upforwd/ns3/named2.conf.j2 index 8b5f6d522a3..6b3855ddad2 100644 --- a/bin/tests/system/upforwd/ns3/named2.conf.j2 +++ b/bin/tests/system/upforwd/ns3/named2.conf.j2 @@ -11,7 +11,6 @@ options { allow-transfer { any; }; recursion no; dnssec-validation no; - notify yes; update-quota 1; }; diff --git a/bin/tests/system/views/ns1/named.conf.j2 b/bin/tests/system/views/ns1/named.conf.j2 index 8d7b125a0c7..0cc901254d0 100644 --- a/bin/tests/system/views/ns1/named.conf.j2 +++ b/bin/tests/system/views/ns1/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion no; dnssec-validation no; - notify yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/views/ns2/named.conf.j2 b/bin/tests/system/views/ns2/named.conf.j2 index ab1e358636b..4bd7647dbce 100644 --- a/bin/tests/system/views/ns2/named.conf.j2 +++ b/bin/tests/system/views/ns2/named.conf.j2 @@ -9,7 +9,6 @@ options { allow-transfer { any; }; recursion yes; dnssec-validation no; - notify yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/views/ns2/named2.conf.j2 b/bin/tests/system/views/ns2/named2.conf.j2 index 7ccf8b3f5d6..4499dd1fa71 100644 --- a/bin/tests/system/views/ns2/named2.conf.j2 +++ b/bin/tests/system/views/ns2/named2.conf.j2 @@ -9,7 +9,6 @@ options { allow-transfer { any; }; recursion yes; dnssec-validation no; - notify yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/views/ns3/named.conf.j2 b/bin/tests/system/views/ns3/named.conf.j2 index 13a403b9ff2..480c3c5793b 100644 --- a/bin/tests/system/views/ns3/named.conf.j2 +++ b/bin/tests/system/views/ns3/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion yes; dnssec-validation no; - notify yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/views/ns3/named2.conf.j2 b/bin/tests/system/views/ns3/named2.conf.j2 index aacc4a42575..5609563fc1c 100644 --- a/bin/tests/system/views/ns3/named2.conf.j2 +++ b/bin/tests/system/views/ns3/named2.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion yes; dnssec-validation no; - notify yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/views/ns5/named.conf.j2 b/bin/tests/system/views/ns5/named.conf.j2 index bb4cb99e295..e5be3ba2c8e 100644 --- a/bin/tests/system/views/ns5/named.conf.j2 +++ b/bin/tests/system/views/ns5/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion yes; dnssec-validation no; - notify yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/wildcard/ns1/named.conf.j2 b/bin/tests/system/wildcard/ns1/named.conf.j2 index 7679821de2e..670dd2d33d8 100644 --- a/bin/tests/system/wildcard/ns1/named.conf.j2 +++ b/bin/tests/system/wildcard/ns1/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion no; dnssec-validation no; - notify yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/wildcard/ns2/named.conf.j2 b/bin/tests/system/wildcard/ns2/named.conf.j2 index 478a1758a95..73f42f3aa0f 100644 --- a/bin/tests/system/wildcard/ns2/named.conf.j2 +++ b/bin/tests/system/wildcard/ns2/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion yes; dnssec-validation no; - notify yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/wildcard/ns3/named.conf.j2 b/bin/tests/system/wildcard/ns3/named.conf.j2 index 341fd030abc..940c22b21af 100644 --- a/bin/tests/system/wildcard/ns3/named.conf.j2 +++ b/bin/tests/system/wildcard/ns3/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion yes; dnssec-validation yes; - notify yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/wildcard/ns4/named.conf.j2 b/bin/tests/system/wildcard/ns4/named.conf.j2 index bc35691c311..904ade5b60e 100644 --- a/bin/tests/system/wildcard/ns4/named.conf.j2 +++ b/bin/tests/system/wildcard/ns4/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion yes; dnssec-validation yes; - notify 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 98e487ef98d..ba1b568a537 100644 --- a/bin/tests/system/wildcard/ns5/named.conf.j2 +++ b/bin/tests/system/wildcard/ns5/named.conf.j2 @@ -8,7 +8,6 @@ options { listen-on-v6 { none; }; recursion yes; dnssec-validation yes; - notify yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/xfer/ns1/named.conf.j2 b/bin/tests/system/xfer/ns1/named.conf.j2 index 8e917454119..5df9978025d 100644 --- a/bin/tests/system/xfer/ns1/named.conf.j2 +++ b/bin/tests/system/xfer/ns1/named.conf.j2 @@ -11,7 +11,6 @@ options { allow-transfer { any; }; recursion no; dnssec-validation no; - notify yes; }; zone "." { diff --git a/bin/tests/system/xfer/ns1/named2.conf.j2 b/bin/tests/system/xfer/ns1/named2.conf.j2 index 893155b1001..888c0620439 100644 --- a/bin/tests/system/xfer/ns1/named2.conf.j2 +++ b/bin/tests/system/xfer/ns1/named2.conf.j2 @@ -11,7 +11,6 @@ options { allow-transfer { any; }; recursion no; dnssec-validation no; - notify yes; }; zone "." { diff --git a/bin/tests/system/xfer/ns1/named3.conf.j2 b/bin/tests/system/xfer/ns1/named3.conf.j2 index d4c9888eb7f..ca395804d2b 100644 --- a/bin/tests/system/xfer/ns1/named3.conf.j2 +++ b/bin/tests/system/xfer/ns1/named3.conf.j2 @@ -11,7 +11,6 @@ options { allow-transfer { any; }; recursion no; dnssec-validation no; - notify yes; }; zone "." { diff --git a/bin/tests/system/xfer/ns2/named.conf.j2 b/bin/tests/system/xfer/ns2/named.conf.j2 index 9765821d72a..f412a434f3d 100644 --- a/bin/tests/system/xfer/ns2/named.conf.j2 +++ b/bin/tests/system/xfer/ns2/named.conf.j2 @@ -9,7 +9,6 @@ options { allow-transfer { any; }; recursion no; dnssec-validation no; - notify yes; ixfr-from-differences yes; check-integrity no; }; diff --git a/bin/tests/system/xfer/ns3/named.conf.j2 b/bin/tests/system/xfer/ns3/named.conf.j2 index ac11f0667bb..d0d64afb10f 100644 --- a/bin/tests/system/xfer/ns3/named.conf.j2 +++ b/bin/tests/system/xfer/ns3/named.conf.j2 @@ -9,7 +9,6 @@ options { allow-transfer { any; }; recursion yes; dnssec-validation no; - notify yes; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/xfer/ns4/named.conf.j2 b/bin/tests/system/xfer/ns4/named.conf.j2 index 9e4ecf3828a..be399c6a722 100644 --- a/bin/tests/system/xfer/ns4/named.conf.j2 +++ b/bin/tests/system/xfer/ns4/named.conf.j2 @@ -10,7 +10,6 @@ options { allow-transfer { any; }; recursion no; dnssec-validation no; - notify yes; blackhole { none; }; }; diff --git a/bin/tests/system/xfer/ns6/named.conf.j2 b/bin/tests/system/xfer/ns6/named.conf.j2 index be713388c04..a28170bc179 100644 --- a/bin/tests/system/xfer/ns6/named.conf.j2 +++ b/bin/tests/system/xfer/ns6/named.conf.j2 @@ -11,7 +11,6 @@ options { allow-transfer { any; }; recursion no; dnssec-validation no; - notify yes; ixfr-from-differences primary; check-integrity no; tcp-idle-timeout 600; diff --git a/bin/tests/system/xfer/ns7/named.conf.j2 b/bin/tests/system/xfer/ns7/named.conf.j2 index d8acedc94b3..9b25c7cdbeb 100644 --- a/bin/tests/system/xfer/ns7/named.conf.j2 +++ b/bin/tests/system/xfer/ns7/named.conf.j2 @@ -11,7 +11,6 @@ options { allow-transfer { any; }; recursion no; dnssec-validation no; - notify yes; ixfr-from-differences secondary; check-integrity no; }; diff --git a/bin/tests/system/xferquota/ns1/named.conf.j2 b/bin/tests/system/xferquota/ns1/named.conf.j2 index 98a473eceea..09abe253262 100644 --- a/bin/tests/system/xferquota/ns1/named.conf.j2 +++ b/bin/tests/system/xferquota/ns1/named.conf.j2 @@ -9,7 +9,6 @@ options { allow-transfer { any; }; recursion no; dnssec-validation no; - notify yes; transfers-out 3; }; diff --git a/bin/tests/system/zonechecks/ns1/named.conf.j2 b/bin/tests/system/zonechecks/ns1/named.conf.j2 index 83b04dec1b8..209d3cbcd3a 100644 --- a/bin/tests/system/zonechecks/ns1/named.conf.j2 +++ b/bin/tests/system/zonechecks/ns1/named.conf.j2 @@ -9,7 +9,6 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; - notify yes; dnssec-validation no; }; diff --git a/bin/tests/system/zonechecks/ns2/named.conf.j2 b/bin/tests/system/zonechecks/ns2/named.conf.j2 index 46c14718e00..12395ba34ce 100644 --- a/bin/tests/system/zonechecks/ns2/named.conf.j2 +++ b/bin/tests/system/zonechecks/ns2/named.conf.j2 @@ -9,7 +9,6 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion no; - notify yes; dnssec-validation no; };