Provide a control channel on named instances that had none

Insert _common/controls.conf.j2 right after the options block in every
started named instance config that declared no control channel at all.
This ensure that each named instance exposes its control channel for the
tests.

Note that some configs may include the control channel via a named.conf
include mechanism. Those are left as is, since the control channel is
already configured via that include mechanism -- and those configs
aren't part of this commit at all.

Assisted-by: Claude:claude-fable-5

diff --git a/bin/tests/system/additional/ns2/named.conf.j2 b/bin/tests/system/additional/ns2/named.conf.j2
index e1fefc00a5069a8ce06674107723492a3f0320d5..4229330f360b7f7c077b36e8678eb750d867d863 100644 (file)
--- a/bin/tests/system/additional/ns2/named.conf.j2
+++ b/bin/tests/system/additional/ns2/named.conf.j2
@@ -12,6 +12,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db";

diff --git a/bin/tests/system/allow_query/ns1/named.conf.j2 b/bin/tests/system/allow_query/ns1/named.conf.j2
index 6dbda6395785ed563e979ddd27d4a4b62e39cd50..85c9c9234bbfb2a6326a913aca4a3529f71ed25b 100644 (file)
--- a/bin/tests/system/allow_query/ns1/named.conf.j2
+++ b/bin/tests/system/allow_query/ns1/named.conf.j2
@@ -7,6 +7,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db";

diff --git a/bin/tests/system/auth/ns1/named.conf.j2 b/bin/tests/system/auth/ns1/named.conf.j2
index 88a54c7d51e528811826b9eb5d95650a77222c53..49b501637822c71bd325d403ff80b846ca3b4269 100644 (file)
--- a/bin/tests/system/auth/ns1/named.conf.j2
+++ b/bin/tests/system/auth/ns1/named.conf.j2
@@ -12,6 +12,8 @@ options {
        send-report-channel "example.rad";
 };
 
+{% include "_common/controls.conf.j2" %}
+
 view main in {
        allow-transfer { any; };
 

diff --git a/bin/tests/system/auth/ns2/named.conf.j2 b/bin/tests/system/auth/ns2/named.conf.j2
index c8f99bc47da6a552d078897f602f3a2077c92c6d..bb4233c4189d8aba4dc959bbd5af6d5af1c42032 100644 (file)
--- a/bin/tests/system/auth/ns2/named.conf.j2
+++ b/bin/tests/system/auth/ns2/named.conf.j2
@@ -11,6 +11,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone example.net {
        type secondary;
        primaries { 10.53.0.1; };

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 7838ea9fb8718d803ef2a2273c841cfac9648495..9c0ed7e16e3774e4d0b62071fcbdebd1355c9339 100644 (file)
--- a/bin/tests/system/auth_res_deleg/ns1/named.conf.j2
+++ b/bin/tests/system/auth_res_deleg/ns1/named.conf.j2
@@ -11,6 +11,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db";

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 87267126c043d206cce76216680d6f07f70b3d31..6d85d35f7bcab6fa591314c23df3a33f5111ac6d 100644 (file)
--- a/bin/tests/system/auth_res_deleg/ns3/named.conf.j2
+++ b/bin/tests/system/auth_res_deleg/ns3/named.conf.j2
@@ -11,6 +11,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "sub.example.db";

diff --git a/bin/tests/system/autosign/ns4/named.conf.j2 b/bin/tests/system/autosign/ns4/named.conf.j2
index d9487ffeb7059447cbf767e71412fae66a4baf6f..bd0d44a1190a063f39ac89591813d4c4619897ea 100644 (file)
--- a/bin/tests/system/autosign/ns4/named.conf.j2
+++ b/bin/tests/system/autosign/ns4/named.conf.j2
@@ -12,6 +12,8 @@ options {
        dnssec-validation yes;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type hint;
        file "../../_common/root.hint";

diff --git a/bin/tests/system/autosign/ns5/named.conf.j2 b/bin/tests/system/autosign/ns5/named.conf.j2
index 711c172c633b20be9cf216d18ed7b960a084af64..35afb28c32f095ce88c9da9c5a3d26b7d79b4bb2 100644 (file)
--- a/bin/tests/system/autosign/ns5/named.conf.j2
+++ b/bin/tests/system/autosign/ns5/named.conf.j2
@@ -12,6 +12,8 @@ options {
        dnssec-validation yes;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type hint;
        file "../../_common/root.hint";

diff --git a/bin/tests/system/cache_delegns/ns1/named.conf.j2 b/bin/tests/system/cache_delegns/ns1/named.conf.j2
index 81f7b54f347b8479f83195ade5c9b5ed24f36be7..ed2f15cadd3e09e650f4dc340a924dd3e6d12bb0 100644 (file)
--- a/bin/tests/system/cache_delegns/ns1/named.conf.j2
+++ b/bin/tests/system/cache_delegns/ns1/named.conf.j2
@@ -11,6 +11,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db";

diff --git a/bin/tests/system/cacheclean/ns1/named.conf.j2 b/bin/tests/system/cacheclean/ns1/named.conf.j2
index 96d4877a2966d747be90e0709f8cbf41b408adf0..f85984516f104c01165bc3eeeac959b4c9d377ab 100644 (file)
--- a/bin/tests/system/cacheclean/ns1/named.conf.j2
+++ b/bin/tests/system/cacheclean/ns1/named.conf.j2
@@ -14,6 +14,8 @@ options {
        minimal-responses no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "example.db";

diff --git a/bin/tests/system/cacheclean/ns3/named.conf.j2 b/bin/tests/system/cacheclean/ns3/named.conf.j2
index df8e0ac5ceb4c5f6f884529f704fe345a0657930..09aa76dfcf9f34bc836a45b93d8d1a10b3fc60ad 100644 (file)
--- a/bin/tests/system/cacheclean/ns3/named.conf.j2
+++ b/bin/tests/system/cacheclean/ns3/named.conf.j2
@@ -14,8 +14,9 @@ options {
        minimal-responses no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "foo.bar.com" {
        type primary;
        file "foo.bar.com.db";
 };
-

diff --git a/bin/tests/system/camp/ns1/named.conf.j2 b/bin/tests/system/camp/ns1/named.conf.j2
index 0db89861dbbd2c4065da9af2129717a251731b06..ca214d5f921e61254b89507507314e65c405fae6 100644 (file)
--- a/bin/tests/system/camp/ns1/named.conf.j2
+++ b/bin/tests/system/camp/ns1/named.conf.j2
@@ -12,6 +12,8 @@ options {
        notify yes;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db";

diff --git a/bin/tests/system/camp/ns2/named.conf.j2 b/bin/tests/system/camp/ns2/named.conf.j2
index ccf5f4d7cd9b103ef317dabd6483446d10713465..4b3a05a5cdb2aa3a827042e83a26d3d02d7cb011 100644 (file)
--- a/bin/tests/system/camp/ns2/named.conf.j2
+++ b/bin/tests/system/camp/ns2/named.conf.j2
@@ -12,6 +12,8 @@ options {
        notify yes;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "tld0" {
        type primary;
        file "tld0.db";

diff --git a/bin/tests/system/cap_glues/ns1/named.conf.j2 b/bin/tests/system/cap_glues/ns1/named.conf.j2
index 1b3caaff9c761fd715848cfdc5e000299a555717..ef0f9a93838a99ea4ac20fb67276ee750033c517 100644 (file)
--- a/bin/tests/system/cap_glues/ns1/named.conf.j2
+++ b/bin/tests/system/cap_glues/ns1/named.conf.j2
@@ -9,6 +9,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db";

diff --git a/bin/tests/system/cap_glues/ns2/named.conf.j2 b/bin/tests/system/cap_glues/ns2/named.conf.j2
index ab242e2c0929e0cf8af4899ab7bccb4b2bcccd3f..958f0a2f66cfbe30f14b0e82edc5e639be2ff986 100644 (file)
--- a/bin/tests/system/cap_glues/ns2/named.conf.j2
+++ b/bin/tests/system/cap_glues/ns2/named.conf.j2
@@ -9,6 +9,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "tld" {
        type primary;
        file "tld.db";

diff --git a/bin/tests/system/case/ns1/named.conf.j2 b/bin/tests/system/case/ns1/named.conf.j2
index e0888c24abd8bc1a0708a1a4d30a879f71135aaa..873733f22919ad1903b3eb0d9b97e40e17b622fd 100644 (file)
--- a/bin/tests/system/case/ns1/named.conf.j2
+++ b/bin/tests/system/case/ns1/named.conf.j2
@@ -15,6 +15,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "example" {
        type primary;
        file "example.db";

diff --git a/bin/tests/system/case/ns2/named.conf.j2 b/bin/tests/system/case/ns2/named.conf.j2
index b8c800716eb050aff5b518ae6c3f93f5cf09071e..85bb3753bf567c52f095e0901e064eb9b532380d 100644 (file)
--- a/bin/tests/system/case/ns2/named.conf.j2
+++ b/bin/tests/system/case/ns2/named.conf.j2
@@ -16,6 +16,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "example" {
        type secondary;
        file "example.bk";

diff --git a/bin/tests/system/chain/ns1/named.conf.j2 b/bin/tests/system/chain/ns1/named.conf.j2
index 286fd2f5251585e563ec9466ec4e7192067319b0..81eaf4c9a22871feb55bf67affc2391454b66421 100644 (file)
--- a/bin/tests/system/chain/ns1/named.conf.j2
+++ b/bin/tests/system/chain/ns1/named.conf.j2
@@ -11,5 +11,6 @@ options {
        notify yes;
 };
 
+{% include "_common/controls.conf.j2" %}
 
 zone "." { type primary; file "root.db"; };

diff --git a/bin/tests/system/chain/ns2/named.conf.j2 b/bin/tests/system/chain/ns2/named.conf.j2
index 72973fd34f9984ca9d514e9a5071fbde7e2dfa4a..98ce052d16ba5ce5329ec9b3df82d212488ab2d4 100644 (file)
--- a/bin/tests/system/chain/ns2/named.conf.j2
+++ b/bin/tests/system/chain/ns2/named.conf.j2
@@ -13,6 +13,8 @@ options {
        notify yes;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone . {
        type hint;
        file "../../_common/root.hint";

diff --git a/bin/tests/system/chain/ns5/named.conf.j2 b/bin/tests/system/chain/ns5/named.conf.j2
index 7162e450a838b8d8fffd117e6914136072006aa1..47adb9926f0fd21dfc4f7d230bb6fb3aba1f127d 100644 (file)
--- a/bin/tests/system/chain/ns5/named.conf.j2
+++ b/bin/tests/system/chain/ns5/named.conf.j2
@@ -13,6 +13,8 @@ options {
        notify yes;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type hint;
        file "../../_common/root.hint";

diff --git a/bin/tests/system/chase_ds/ns1/named.conf.j2 b/bin/tests/system/chase_ds/ns1/named.conf.j2
index 7c45a46235aac4c1dc8069dbb62e83f85df15eb1..b2126e0f77aedd12375a0a8c51dbe580a505c052 100644 (file)
--- a/bin/tests/system/chase_ds/ns1/named.conf.j2
+++ b/bin/tests/system/chase_ds/ns1/named.conf.j2
@@ -11,6 +11,8 @@ options {
        dnssec-validation yes;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db.signed";

diff --git a/bin/tests/system/chase_ds/ns2/named.conf.j2 b/bin/tests/system/chase_ds/ns2/named.conf.j2
index 55036d274271cd6616f00c5294cc3e1335c0aec6..17086676a9044b84666e28d3b7ab37afa8196f32 100644 (file)
--- a/bin/tests/system/chase_ds/ns2/named.conf.j2
+++ b/bin/tests/system/chase_ds/ns2/named.conf.j2
@@ -10,6 +10,8 @@ options {
        notify yes;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "example" {
        type primary;
        file "example.db.signed";

diff --git a/bin/tests/system/checkds/ns1/named.conf.j2 b/bin/tests/system/checkds/ns1/named.conf.j2
index 723e1ccdd16f1646239483d18ec8776dbce25b20..4a858d5fc7882c2e4b004f1cd8c39a45eac3896f 100644 (file)
--- a/bin/tests/system/checkds/ns1/named.conf.j2
+++ b/bin/tests/system/checkds/ns1/named.conf.j2
@@ -13,6 +13,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db.signed";

diff --git a/bin/tests/system/checknames/ns1/named.conf.j2 b/bin/tests/system/checknames/ns1/named.conf.j2
index 56b63e80d9cca40f8f14aad586d4acb974ebbda6..a50be2c4904ff0c857f7b049465accae3ace36cd 100644 (file)
--- a/bin/tests/system/checknames/ns1/named.conf.j2
+++ b/bin/tests/system/checknames/ns1/named.conf.j2
@@ -12,6 +12,8 @@ options {
        check-integrity no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db";

diff --git a/bin/tests/system/checknames/ns2/named.conf.j2 b/bin/tests/system/checknames/ns2/named.conf.j2
index bac9992cf3340f8b6eb80389bfb374b23ab203fc..0bddeee23502d113602c6c0976ad361952caf1b7 100644 (file)
--- a/bin/tests/system/checknames/ns2/named.conf.j2
+++ b/bin/tests/system/checknames/ns2/named.conf.j2
@@ -12,6 +12,7 @@ options {
        notify yes;
 };
 
+{% include "_common/controls.conf.j2" %}
 
 zone "." {
        type hint;

diff --git a/bin/tests/system/checknames/ns3/named.conf.j2 b/bin/tests/system/checknames/ns3/named.conf.j2
index 7385246fb170dda45408026cfda9c24fd486d3a1..4631725c4788fe46815cd6a1dee42a8ce5ac1339 100644 (file)
--- a/bin/tests/system/checknames/ns3/named.conf.j2
+++ b/bin/tests/system/checknames/ns3/named.conf.j2
@@ -12,6 +12,7 @@ options {
        notify yes;
 };
 
+{% include "_common/controls.conf.j2" %}
 
 zone "." {
        type hint;

diff --git a/bin/tests/system/checknames/ns4/named.conf.j2 b/bin/tests/system/checknames/ns4/named.conf.j2
index f79e5b820b30dbcde1e34fa89a84d5270b3919ca..f87d60ca49b86755a8a0be1041703198db6d1cad 100644 (file)
--- a/bin/tests/system/checknames/ns4/named.conf.j2
+++ b/bin/tests/system/checknames/ns4/named.conf.j2
@@ -14,6 +14,7 @@ options {
        notify yes;
 };
 
+{% include "_common/controls.conf.j2" %}
 
 zone "." {
        type hint;

diff --git a/bin/tests/system/checknames/ns5/named.conf.j2 b/bin/tests/system/checknames/ns5/named.conf.j2
index 55ceaa8df1388b731357b13224a64ab36733a9d0..d0a89a74342545411158cbbabd35da2f81017c73 100644 (file)
--- a/bin/tests/system/checknames/ns5/named.conf.j2
+++ b/bin/tests/system/checknames/ns5/named.conf.j2
@@ -14,6 +14,7 @@ options {
        notify yes;
 };
 
+{% include "_common/controls.conf.j2" %}
 
 zone "." {
        type hint;

diff --git a/bin/tests/system/cookie/ns2/named.conf.j2 b/bin/tests/system/cookie/ns2/named.conf.j2
index e2d0494255f7ba247a32bbc9a24386bac1fc2860..ad9e6a81088fee1492f05ef0c408cad0c04ba1ea 100644 (file)
--- a/bin/tests/system/cookie/ns2/named.conf.j2
+++ b/bin/tests/system/cookie/ns2/named.conf.j2
@@ -12,6 +12,8 @@ options {
        nocookie-udp-size 512;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db";

diff --git a/bin/tests/system/cookie/ns7/named.conf.j2 b/bin/tests/system/cookie/ns7/named.conf.j2
index bc81bfc77cddbfa74fc99ad2ba61b4ea93299837..b1769fd78f3239f91cd3a0f328cbcf951193ab4f 100644 (file)
--- a/bin/tests/system/cookie/ns7/named.conf.j2
+++ b/bin/tests/system/cookie/ns7/named.conf.j2
@@ -13,6 +13,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db";

diff --git a/bin/tests/system/cpu/ns1/named.conf.j2 b/bin/tests/system/cpu/ns1/named.conf.j2
index 4494215cdb6a7211aaf6a22c684def3698fb7c4a..5bb320848c54a57d374728720a808c50210ac13c 100644 (file)
--- a/bin/tests/system/cpu/ns1/named.conf.j2
+++ b/bin/tests/system/cpu/ns1/named.conf.j2
@@ -5,3 +5,5 @@ options {
        listen-on { 10.53.0.1; };
        listen-on-v6 { none; };
 };
+
+{% include "_common/controls.conf.j2" %}

diff --git a/bin/tests/system/cyclic_glue/ns2/named.conf.j2 b/bin/tests/system/cyclic_glue/ns2/named.conf.j2
index 6acab2ecb505b82dcb04e08a91ec57c40a5645e7..6b913d96587940bb2ffc9a2bd1e2de40250c5aaa 100644 (file)
--- a/bin/tests/system/cyclic_glue/ns2/named.conf.j2
+++ b/bin/tests/system/cyclic_glue/ns2/named.conf.j2
@@ -12,6 +12,8 @@ options {
        minimal-responses no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "test" {
        type primary;
        file "test.db";

diff --git a/bin/tests/system/cyclic_glue/ns3/named.conf.j2 b/bin/tests/system/cyclic_glue/ns3/named.conf.j2
index 5bc355ce265d0de525ba5b6007149dd6b8e4b682..0d081ec8c6f847afd7fe1cc2abe00551eaccc380 100644 (file)
--- a/bin/tests/system/cyclic_glue/ns3/named.conf.j2
+++ b/bin/tests/system/cyclic_glue/ns3/named.conf.j2
@@ -11,6 +11,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "foo.test" {
        type primary;
        file "zones.db";

diff --git a/bin/tests/system/delegation_ttl/ns1/named.conf.j2 b/bin/tests/system/delegation_ttl/ns1/named.conf.j2
index 1b3caaff9c761fd715848cfdc5e000299a555717..ef0f9a93838a99ea4ac20fb67276ee750033c517 100644 (file)
--- a/bin/tests/system/delegation_ttl/ns1/named.conf.j2
+++ b/bin/tests/system/delegation_ttl/ns1/named.conf.j2
@@ -9,6 +9,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db";

diff --git a/bin/tests/system/digdelv/ns1/named.conf.j2 b/bin/tests/system/digdelv/ns1/named.conf.j2
index 1b3f74bfd8f19f414650d68fae598c996bf5dd89..c94b855a8b81095a4f1a81a55bb03889db6a5955 100644 (file)
--- a/bin/tests/system/digdelv/ns1/named.conf.j2
+++ b/bin/tests/system/digdelv/ns1/named.conf.j2
@@ -11,6 +11,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db";

diff --git a/bin/tests/system/digdelv/ns2/named.conf.j2 b/bin/tests/system/digdelv/ns2/named.conf.j2
index 90889a222748b848a2531a36ded5819756be960f..4fa3afd74934ea33c69d6c220d626add18d43a2a 100644 (file)
--- a/bin/tests/system/digdelv/ns2/named.conf.j2
+++ b/bin/tests/system/digdelv/ns2/named.conf.j2
@@ -11,6 +11,8 @@ options {
        minimal-any no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type hint;
        file "../../_common/root.hint";

diff --git a/bin/tests/system/digdelv/ns3/named.conf.j2 b/bin/tests/system/digdelv/ns3/named.conf.j2
index 504f6658f2558e21dbcef09d55a99788a6dc1a3b..bc7f247015486d9adcff6eddf3e933e0e40f41a7 100644 (file)
--- a/bin/tests/system/digdelv/ns3/named.conf.j2
+++ b/bin/tests/system/digdelv/ns3/named.conf.j2
@@ -10,6 +10,8 @@ options {
        minimal-any no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type hint;
        file "../../_common/root.hint";

diff --git a/bin/tests/system/dns64/ns2/named.conf.j2 b/bin/tests/system/dns64/ns2/named.conf.j2
index 7a2bdb529d3c239c20113fbd5da0367f5f3cafc1..38ede07c09623c084fdbb24039eb0efd45fed1b2 100644 (file)
--- a/bin/tests/system/dns64/ns2/named.conf.j2
+++ b/bin/tests/system/dns64/ns2/named.conf.j2
@@ -47,6 +47,7 @@ options {
        response-policy { zone "rpz"; };
 };
 
+{% include "_common/controls.conf.j2" %}
 
 zone "." {
        type hint;

diff --git a/bin/tests/system/dns64/ns3/named.conf.j2 b/bin/tests/system/dns64/ns3/named.conf.j2
index b3a3d926f09c977848b3f94450774a43dc13f87c..96bef6e0809abdddbf6e65147c8532544edbd683 100644 (file)
--- a/bin/tests/system/dns64/ns3/named.conf.j2
+++ b/bin/tests/system/dns64/ns3/named.conf.j2
@@ -27,6 +27,7 @@ options {
        };
 };
 
+{% include "_common/controls.conf.j2" %}
 
 zone "." {
        type hint;

diff --git a/bin/tests/system/dns64/ns4/named.conf.j2 b/bin/tests/system/dns64/ns4/named.conf.j2
index 0a74455c939a0ea77c3b4b8f3c2b31905c080794..0e461df50ddff85c4002cc521f0b0857a3a87101 100644 (file)
--- a/bin/tests/system/dns64/ns4/named.conf.j2
+++ b/bin/tests/system/dns64/ns4/named.conf.j2
@@ -17,6 +17,7 @@ options {
        recursion no;
 };
 
+{% include "_common/controls.conf.j2" %}
 
 zone "." {
        type master;

diff --git a/bin/tests/system/dns64_dname/ns1/named.conf.j2 b/bin/tests/system/dns64_dname/ns1/named.conf.j2
index c65897087aff703df68a84044f8a96ae1ac0d10b..29d15a1a4c85bcf6b709aa8b1efeca4878dbb747 100644 (file)
--- a/bin/tests/system/dns64_dname/ns1/named.conf.j2
+++ b/bin/tests/system/dns64_dname/ns1/named.conf.j2
@@ -10,6 +10,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db";

diff --git a/bin/tests/system/dns64_dname/ns2/named.conf.j2 b/bin/tests/system/dns64_dname/ns2/named.conf.j2
index f785ba3c835f37d515b8bc32c5a0bdcc1bfeb7f4..f9fd7df3718a31dfe2156367dbcd3113081f4521 100644 (file)
--- a/bin/tests/system/dns64_dname/ns2/named.conf.j2
+++ b/bin/tests/system/dns64_dname/ns2/named.conf.j2
@@ -14,6 +14,8 @@ options {
        dns64 64:ff9b::/96 { };
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type hint;
        file "root.hint";

diff --git a/bin/tests/system/dnssec/ns1/named.conf.j2 b/bin/tests/system/dnssec/ns1/named.conf.j2
index e5ef55d4c759ed381b0de495aced7c186bbd5822..6e44477375162389b67f5b58d0636617666eeff4 100644 (file)
--- a/bin/tests/system/dnssec/ns1/named.conf.j2
+++ b/bin/tests/system/dnssec/ns1/named.conf.j2
@@ -17,6 +17,8 @@ options {
        trust-anchor-telemetry no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db.signed";

diff --git a/bin/tests/system/dnssec/ns6/named.conf.j2 b/bin/tests/system/dnssec/ns6/named.conf.j2
index 0c260f2c202a04f64f1ebf06dc1854c0fa0da979..79d0be40f9a43bc1823a0e7874f30ae1e8d4d358 100644 (file)
--- a/bin/tests/system/dnssec/ns6/named.conf.j2
+++ b/bin/tests/system/dnssec/ns6/named.conf.j2
@@ -15,6 +15,8 @@ options {
        dnssec-validation yes;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type hint;
        file "../../_common/root.hint";

diff --git a/bin/tests/system/dnssec_bypass/ns1/named.conf.j2 b/bin/tests/system/dnssec_bypass/ns1/named.conf.j2
index 59ced1831a12665c252376e7ab43ead5b3296a51..1cb517b6985f6b051a84a2edbc177a0dcdf70bad 100644 (file)
--- a/bin/tests/system/dnssec_bypass/ns1/named.conf.j2
+++ b/bin/tests/system/dnssec_bypass/ns1/named.conf.j2
@@ -20,6 +20,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "test." {
        type primary;
        file "test.db.signed";

diff --git a/bin/tests/system/dnssec_bypass/ns2/named.conf.j2 b/bin/tests/system/dnssec_bypass/ns2/named.conf.j2
index e81cee7cac2baff1b5925b53219ca2a425b5e4e3..bdc534239891c6cb09e58a946f224e6b9212c340 100644 (file)
--- a/bin/tests/system/dnssec_bypass/ns2/named.conf.j2
+++ b/bin/tests/system/dnssec_bypass/ns2/named.conf.j2
@@ -20,6 +20,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "victim.test." {
        type primary;
        file "victim.db.signed";

diff --git a/bin/tests/system/dnssec_bypass/ns3/named.conf.j2 b/bin/tests/system/dnssec_bypass/ns3/named.conf.j2
index 17d3e18e4e16301ef2ee0c3d799f49a1d832a348..d5d4a2be9200546223323a322f2486fd3d2bf5f1 100644 (file)
--- a/bin/tests/system/dnssec_bypass/ns3/named.conf.j2
+++ b/bin/tests/system/dnssec_bypass/ns3/named.conf.j2
@@ -20,6 +20,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "evil.test." {
        type primary;
        file "evil.db.signed";

diff --git a/bin/tests/system/dnssec_bypass/ns4/named.conf.j2 b/bin/tests/system/dnssec_bypass/ns4/named.conf.j2
index 039695d9b797b5443491148e858ec66f2faac890..065dcf1ce41639a6ff38fed29d2d483eb359132e 100644 (file)
--- a/bin/tests/system/dnssec_bypass/ns4/named.conf.j2
+++ b/bin/tests/system/dnssec_bypass/ns4/named.conf.j2
@@ -25,6 +25,8 @@ options {
        synth-from-dnssec yes;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 trust-anchors {
        @root.domain@ @root.type@ @root.contents@;
 };

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 fbabe4ce83846d6f6ebe77a6ddb79c6af262f058..786530ca35276fc1214fabb950b6f96986db5380 100644 (file)
--- a/bin/tests/system/dnssec_cname_response/ns3/named.conf.j2
+++ b/bin/tests/system/dnssec_cname_response/ns3/named.conf.j2
@@ -11,6 +11,8 @@ options {
        recursion yes;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "example." {
        type static-stub;
        server-addresses { 10.53.0.2; };

diff --git a/bin/tests/system/ednscompliance/ns1/named.conf.j2 b/bin/tests/system/ednscompliance/ns1/named.conf.j2
index 8be5df6d0a819c88633ff54d13f18008050202e8..1c10d0fce2c058890e6d5ae15344b3155014d663 100644 (file)
--- a/bin/tests/system/ednscompliance/ns1/named.conf.j2
+++ b/bin/tests/system/ednscompliance/ns1/named.conf.j2
@@ -11,6 +11,8 @@ options {
        server-id "ns1";
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db";

diff --git a/bin/tests/system/fetchlimit/ns1/named.conf.j2 b/bin/tests/system/fetchlimit/ns1/named.conf.j2
index c4e161a795956590565129584051f0e4588c4fdc..c68ddd0467a93ea0fed6b4d3ebe2f08170694197 100644 (file)
--- a/bin/tests/system/fetchlimit/ns1/named.conf.j2
+++ b/bin/tests/system/fetchlimit/ns1/named.conf.j2
@@ -11,6 +11,8 @@ options {
        notify yes;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db";

diff --git a/bin/tests/system/formerr/ns1/named.conf.j2 b/bin/tests/system/formerr/ns1/named.conf.j2
index f78a62a9bdc5525b28503e4ad12a4db5b0076b94..0cc901254d08438b15768f1a84b626db4afa755a 100644 (file)
--- a/bin/tests/system/formerr/ns1/named.conf.j2
+++ b/bin/tests/system/formerr/ns1/named.conf.j2
@@ -10,6 +10,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db";

diff --git a/bin/tests/system/forward/ns1/named.conf.j2 b/bin/tests/system/forward/ns1/named.conf.j2
index 3383ef974a43b8c08f882b95c38fc51cec92b003..f0bf86ba7f92b0cc21f34d5c29b407c32302af93 100644 (file)
--- a/bin/tests/system/forward/ns1/named.conf.j2
+++ b/bin/tests/system/forward/ns1/named.conf.j2
@@ -13,6 +13,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db.signed";

diff --git a/bin/tests/system/forward/ns10/named.conf.j2 b/bin/tests/system/forward/ns10/named.conf.j2
index d12882ef764ac018218d90427910fd30da99505f..815d92305a1d878210d0f4053a94e67ccb9fcfb8 100644 (file)
--- a/bin/tests/system/forward/ns10/named.conf.j2
+++ b/bin/tests/system/forward/ns10/named.conf.j2
@@ -10,6 +10,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "net." {
        type master;
        file "fakenet.db";

diff --git a/bin/tests/system/forward/ns2/named.conf.j2 b/bin/tests/system/forward/ns2/named.conf.j2
index 0a13edc736e4a5a7e21e8a7bff51d18d17d29762..af7033b5d50ed3385d177bcc20d0928ec2fda205 100644 (file)
--- a/bin/tests/system/forward/ns2/named.conf.j2
+++ b/bin/tests/system/forward/ns2/named.conf.j2
@@ -26,6 +26,8 @@ options {
 
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type hint;
        file "root.db";

diff --git a/bin/tests/system/forward/ns4/named.conf.j2 b/bin/tests/system/forward/ns4/named.conf.j2
index e2a381cd4cd49c756b174b580e018521e18eb32e..5854c30999a58f8465a431053bd87c1d0c854a0d 100644 (file)
--- a/bin/tests/system/forward/ns4/named.conf.j2
+++ b/bin/tests/system/forward/ns4/named.conf.j2
@@ -20,6 +20,8 @@ options {
 
 };
 
+{% include "_common/controls.conf.j2" %}
+
 {% if FEATURE_JSON_C == "1" %}
 statistics-channels { inet 10.53.0.4 port @EXTRAPORT1@ allow { localhost; }; };
 {% endif %}

diff --git a/bin/tests/system/forward/ns5/named.conf.j2 b/bin/tests/system/forward/ns5/named.conf.j2
index 02b8b7ed2b875552f0d018949d14d2c7e0df46f5..bf7ce3cb528e8f2c826906ad94ee57891a3ea6ed 100644 (file)
--- a/bin/tests/system/forward/ns5/named.conf.j2
+++ b/bin/tests/system/forward/ns5/named.conf.j2
@@ -12,6 +12,7 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
 
 zone "." {
        type hint;

diff --git a/bin/tests/system/forward/ns7/named.conf.j2 b/bin/tests/system/forward/ns7/named.conf.j2
index 3fc932af227d993f882df40fbc9152bbcdf02aed..fc392c37d4ff674edfb3ea52773cfb3f6f09a658 100644 (file)
--- a/bin/tests/system/forward/ns7/named.conf.j2
+++ b/bin/tests/system/forward/ns7/named.conf.j2
@@ -11,6 +11,7 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
 
 zone "." {
        type hint;

diff --git a/bin/tests/system/forward/ns8/named.conf.j2 b/bin/tests/system/forward/ns8/named.conf.j2
index bed7c17240b9b6300edafedc7881775037ba5fa5..0d44e5f900a23eed7fa2cdcd3e0170db25f0a887 100644 (file)
--- a/bin/tests/system/forward/ns8/named.conf.j2
+++ b/bin/tests/system/forward/ns8/named.conf.j2
@@ -11,6 +11,7 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
 
 zone "." {
        type hint;

diff --git a/bin/tests/system/glue/ns1/named.conf.j2 b/bin/tests/system/glue/ns1/named.conf.j2
index b38108410bc9ac790a3607d0ddc8e3f68f21002d..684150bfe19bcf5cc9b1ee30d8a4a7287b48ed9c 100644 (file)
--- a/bin/tests/system/glue/ns1/named.conf.j2
+++ b/bin/tests/system/glue/ns1/named.conf.j2
@@ -11,6 +11,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db";

diff --git a/bin/tests/system/host/ns1/named.conf.j2 b/bin/tests/system/host/ns1/named.conf.j2
index 5e63f8a07c3c1c96ebad8de805fb955c4b6490f2..3a5a0a027525f78f75fae1aeddefc9c31fd3f272 100644 (file)
--- a/bin/tests/system/host/ns1/named.conf.j2
+++ b/bin/tests/system/host/ns1/named.conf.j2
@@ -10,6 +10,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "example" {
        type primary;
        file "example.db";

diff --git a/bin/tests/system/idna/ns1/named.conf.j2 b/bin/tests/system/idna/ns1/named.conf.j2
index 1b3f74bfd8f19f414650d68fae598c996bf5dd89..c94b855a8b81095a4f1a81a55bb03889db6a5955 100644 (file)
--- a/bin/tests/system/idna/ns1/named.conf.j2
+++ b/bin/tests/system/idna/ns1/named.conf.j2
@@ -11,6 +11,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db";

diff --git a/bin/tests/system/include_multiplecfg/ns2/named.conf.j2 b/bin/tests/system/include_multiplecfg/ns2/named.conf.j2
index 418ed68c31f18ba1b08a7cf31145e54ff281e24b..641dcd88b133973919960a4ada3826c9e1479f18 100644 (file)
--- a/bin/tests/system/include_multiplecfg/ns2/named.conf.j2
+++ b/bin/tests/system/include_multiplecfg/ns2/named.conf.j2
@@ -8,9 +8,10 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 # Should include all files matching pattern.
 include "zone*.conf";
 
 # Shouldn't break standard file pattern.
 include "mars.conf";
-

diff --git a/bin/tests/system/inline/ns4/named.conf.j2 b/bin/tests/system/inline/ns4/named.conf.j2
index 5c795759e7a4aa8f1d36b2497596abed5999c8c1..f20f7807b3204fcfe645b29c4995dbab4dce93b1 100644 (file)
--- a/bin/tests/system/inline/ns4/named.conf.j2
+++ b/bin/tests/system/inline/ns4/named.conf.j2
@@ -15,6 +15,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "noixfr" {
        type primary;
        file "noixfr.db";

diff --git a/bin/tests/system/integrity/ns1/named.conf.j2 b/bin/tests/system/integrity/ns1/named.conf.j2
index cc1474604b492f7fd8ecdc867148bd857a8559bc..134fda0e628ad710c981ba71be81e34206debb7b 100644 (file)
--- a/bin/tests/system/integrity/ns1/named.conf.j2
+++ b/bin/tests/system/integrity/ns1/named.conf.j2
@@ -13,6 +13,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type hint;
        file "../../_common/root.hint";

diff --git a/bin/tests/system/kasp/ns1/named.conf.j2 b/bin/tests/system/kasp/ns1/named.conf.j2
index 4280a2829cfd9a62bfdfc50da57a5414afc94528..d99ee3c39b37cfd5e75ada10d4bb8f7985776014 100644 (file)
--- a/bin/tests/system/kasp/ns1/named.conf.j2
+++ b/bin/tests/system/kasp/ns1/named.conf.j2
@@ -13,6 +13,8 @@ options {
         allow-transfer { any; };
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db";

diff --git a/bin/tests/system/legacy/ns10/named.conf.j2 b/bin/tests/system/legacy/ns10/named.conf.j2
index 38eb4992e14aa10b1f9a5b8e59e5af6f4a0a4756..094e6f14e15ac682c55738e00da13744a2aa706c 100644 (file)
--- a/bin/tests/system/legacy/ns10/named.conf.j2
+++ b/bin/tests/system/legacy/ns10/named.conf.j2
@@ -10,6 +10,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "ednsrefused" {
        type primary;
        file "ednsrefused.db";

diff --git a/bin/tests/system/legacy/ns2/named.conf.j2 b/bin/tests/system/legacy/ns2/named.conf.j2
index 81701dc5281e5f1087035a9e9db168997dbd2a32..38a165bbd370ca18d9ed6edfb0176b5f66a61296 100644 (file)
--- a/bin/tests/system/legacy/ns2/named.conf.j2
+++ b/bin/tests/system/legacy/ns2/named.conf.j2
@@ -10,6 +10,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "dropedns" {
        type primary;
        file "dropedns.db";

diff --git a/bin/tests/system/legacy/ns3/named.conf.j2 b/bin/tests/system/legacy/ns3/named.conf.j2
index 6f43e65e654097dbd6c3cfba767969a8a0a6e64e..1a77304d6323eff2d52f5553a1efa4d610839cd3 100644 (file)
--- a/bin/tests/system/legacy/ns3/named.conf.j2
+++ b/bin/tests/system/legacy/ns3/named.conf.j2
@@ -10,6 +10,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "dropedns-notcp" {
        type primary;
        file "dropedns-notcp.db";

diff --git a/bin/tests/system/legacy/ns4/named.conf.j2 b/bin/tests/system/legacy/ns4/named.conf.j2
index 9a5bca99a05fd44953d9c6fc4bf62bc911acaeba..e90fa7f8dd2aac0b052bf5b910677792a6ae8420 100644 (file)
--- a/bin/tests/system/legacy/ns4/named.conf.j2
+++ b/bin/tests/system/legacy/ns4/named.conf.j2
@@ -10,6 +10,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "plain" {
        type primary;
        file "plain.db";

diff --git a/bin/tests/system/legacy/ns5/named.conf.j2 b/bin/tests/system/legacy/ns5/named.conf.j2
index 28d93c0f7c2e22e6395cf98ce259fda23815de71..7f84ed4a3ce836b5ebdd04d2365ab638011e97d6 100644 (file)
--- a/bin/tests/system/legacy/ns5/named.conf.j2
+++ b/bin/tests/system/legacy/ns5/named.conf.j2
@@ -10,6 +10,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "plain-notcp" {
        type primary;
        file "plain-notcp.db";

diff --git a/bin/tests/system/legacy/ns6/named.conf.j2 b/bin/tests/system/legacy/ns6/named.conf.j2
index b6cb3f6ea48f1823d9d31ea1bf9e71edaa5b8f0f..340f066574704d7f710172e70a5cf56cb940b732 100644 (file)
--- a/bin/tests/system/legacy/ns6/named.conf.j2
+++ b/bin/tests/system/legacy/ns6/named.conf.j2
@@ -10,6 +10,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "edns512" {
        type primary;
        file "edns512.db.signed";

diff --git a/bin/tests/system/legacy/ns7/named.conf.j2 b/bin/tests/system/legacy/ns7/named.conf.j2
index 474fdc0855324a236ba08d8006747937c232ce6c..d141a6366c83223f16062adcff46a58e5722a099 100644 (file)
--- a/bin/tests/system/legacy/ns7/named.conf.j2
+++ b/bin/tests/system/legacy/ns7/named.conf.j2
@@ -10,6 +10,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "edns512-notcp" {
        type primary;
        file "edns512-notcp.db.signed";

diff --git a/bin/tests/system/legacy/ns8/named.conf.j2 b/bin/tests/system/legacy/ns8/named.conf.j2
index 153a9af0c4ceaef97dd17caa7bbff527bb8311ac..4a759fcd5d3c50e9a4d45812568f14f060c3d385 100644 (file)
--- a/bin/tests/system/legacy/ns8/named.conf.j2
+++ b/bin/tests/system/legacy/ns8/named.conf.j2
@@ -10,6 +10,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "ednsformerr" {
        type primary;
        file "ednsformerr.db";

diff --git a/bin/tests/system/legacy/ns9/named.conf.j2 b/bin/tests/system/legacy/ns9/named.conf.j2
index 415c6ad4d9b8265935b9663fa7bd0da4a4c0cc4f..21843140738abd0ac79aa874b135f8ed2acea55f 100644 (file)
--- a/bin/tests/system/legacy/ns9/named.conf.j2
+++ b/bin/tests/system/legacy/ns9/named.conf.j2
@@ -10,6 +10,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "ednsnotimp" {
        type primary;
        file "ednsnotimp.db";

diff --git a/bin/tests/system/limits/ns1/named.conf.j2 b/bin/tests/system/limits/ns1/named.conf.j2
index 61e23062ba879c318101c5c3b328dd48d9002804..ebf502dae5ff640e8c9e0d6d90961b8a23d85d32 100644 (file)
--- a/bin/tests/system/limits/ns1/named.conf.j2
+++ b/bin/tests/system/limits/ns1/named.conf.j2
@@ -13,6 +13,8 @@ options {
        max-records-per-type 0;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db";

diff --git a/bin/tests/system/masterfile/ns1/named.conf.j2 b/bin/tests/system/masterfile/ns1/named.conf.j2
index 9fb80ce5fda4f2eef5331bbaa55f97ffc0725d65..8e9b7b01dc2b54ed56225a592ddb6bae8b90a434 100644 (file)
--- a/bin/tests/system/masterfile/ns1/named.conf.j2
+++ b/bin/tests/system/masterfile/ns1/named.conf.j2
@@ -12,6 +12,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "include" {
        type primary;
        file "include.db";

diff --git a/bin/tests/system/masterfile/ns2/named.conf.j2 b/bin/tests/system/masterfile/ns2/named.conf.j2
index 72fa31d161b23740a68feb03ebcf17cdbab29f43..0653e1b987a05f5c1d493bff67841adfb78585f9 100644 (file)
--- a/bin/tests/system/masterfile/ns2/named.conf.j2
+++ b/bin/tests/system/masterfile/ns2/named.conf.j2
@@ -14,6 +14,7 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
 
 zone "." {
        type hint;

diff --git a/bin/tests/system/masterformat/ns2/named.conf.j2 b/bin/tests/system/masterformat/ns2/named.conf.j2
index 8dd7731d47ac791e8db871d7592f76075ee55385..8981f99903806c361b359cfcfcfaff4d557a30df 100644 (file)
--- a/bin/tests/system/masterformat/ns2/named.conf.j2
+++ b/bin/tests/system/masterformat/ns2/named.conf.j2
@@ -13,6 +13,8 @@ options {
        max-types-per-name 200;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "example" {
        type primary;
        file "example.db";

diff --git a/bin/tests/system/mirror/ns1/named.conf.j2 b/bin/tests/system/mirror/ns1/named.conf.j2
index 7b3ecfc772cd10949d3fffe6122a54811fd6c867..bcb8c46c7d4f91df749b23d85bf5d1152f27ca15 100644 (file)
--- a/bin/tests/system/mirror/ns1/named.conf.j2
+++ b/bin/tests/system/mirror/ns1/named.conf.j2
@@ -11,6 +11,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db.signed";

diff --git a/bin/tests/system/multisigner/ns1/named.conf.j2 b/bin/tests/system/multisigner/ns1/named.conf.j2
index 23ae26b2754d1ee3b297cd24e9481baaf12e528d..dacf753f2076f1d83d87297cd16e71ee59e0f6fc 100644 (file)
--- a/bin/tests/system/multisigner/ns1/named.conf.j2
+++ b/bin/tests/system/multisigner/ns1/named.conf.j2
@@ -12,6 +12,8 @@ options {
        notify yes;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db.signed";

diff --git a/bin/tests/system/names/ns1/named.conf.j2 b/bin/tests/system/names/ns1/named.conf.j2
index 157f95f3c0fb8a1a287854331b5850e2e4d6660e..b97647f5719471afa60bbfa74945c7522206fcd5 100644 (file)
--- a/bin/tests/system/names/ns1/named.conf.j2
+++ b/bin/tests/system/names/ns1/named.conf.j2
@@ -13,6 +13,7 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
 
 view compress {
        match-clients { 10.53.0.1/32; };

diff --git a/bin/tests/system/notify/ns1/named.conf.j2 b/bin/tests/system/notify/ns1/named.conf.j2
index 20a0ef7cb76b7f1b73c35a2e63c8585ce39c12f0..ca9e1b81d88eecdd753aa51545ce1a762f95cd94 100644 (file)
--- a/bin/tests/system/notify/ns1/named.conf.j2
+++ b/bin/tests/system/notify/ns1/named.conf.j2
@@ -13,6 +13,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db";

diff --git a/bin/tests/system/notify/ns3/named.conf.j2 b/bin/tests/system/notify/ns3/named.conf.j2
index b583c775a4ccf42b3da594cad61919b518f15a51..b63243a02fef03c062381c85cb23e3683ec71aae 100644 (file)
--- a/bin/tests/system/notify/ns3/named.conf.j2
+++ b/bin/tests/system/notify/ns3/named.conf.j2
@@ -22,6 +22,8 @@ options {
 
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type hint;
        file "../../_common/root.hint";

diff --git a/bin/tests/system/notify/ns4/named.conf.j2 b/bin/tests/system/notify/ns4/named.conf.j2
index 4c6703c6d2e24b657953a3b8d7bf52ddb940b22e..99306c65b368728d5f1c82e7956a62f1494be79c 100644 (file)
--- a/bin/tests/system/notify/ns4/named.conf.j2
+++ b/bin/tests/system/notify/ns4/named.conf.j2
@@ -12,6 +12,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type hint;
        file "../../_common/root.hint";

diff --git a/bin/tests/system/notify/ns5/named.conf.j2 b/bin/tests/system/notify/ns5/named.conf.j2
index 8c2c85ddc2117967b8f66121ff3fe3785a5610f9..8979a067bfa15c25e89377246174269fb639d1da 100644 (file)
--- a/bin/tests/system/notify/ns5/named.conf.j2
+++ b/bin/tests/system/notify/ns5/named.conf.j2
@@ -27,6 +27,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 view "a" {
        match-clients { key "a"; };
        zone "x21" {

diff --git a/bin/tests/system/nsec/ns1/named.conf.j2 b/bin/tests/system/nsec/ns1/named.conf.j2
index 237e29805fbfc326e6c970006d2d6a1a42c45b6b..49dbe6cbeab0aa5e122cfcc82ee8ea3c91d778bd 100644 (file)
--- a/bin/tests/system/nsec/ns1/named.conf.j2
+++ b/bin/tests/system/nsec/ns1/named.conf.j2
@@ -10,6 +10,8 @@ options {
        notify yes;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db";

diff --git a/bin/tests/system/nsec/ns2/named.conf.j2 b/bin/tests/system/nsec/ns2/named.conf.j2
index a2e2981603ae6c4a8777336f77c074f52982c618..1a41313ddfafe7ee6d1298d8ae2ac2a77b68d619 100644 (file)
--- a/bin/tests/system/nsec/ns2/named.conf.j2
+++ b/bin/tests/system/nsec/ns2/named.conf.j2
@@ -10,6 +10,8 @@ options {
        notify yes;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "excessive-nsec-rrsigs" {
        type primary;
        file "excessive-nsec-rrsigs.db.signed";

diff --git a/bin/tests/system/nsec/ns3/named.conf.j2 b/bin/tests/system/nsec/ns3/named.conf.j2
index 6fddf827c88dca81292ca6851e7a7cb285a51be6..d07e16e1d9ed01d58f62ccbf2849e8ce34136478 100644 (file)
--- a/bin/tests/system/nsec/ns3/named.conf.j2
+++ b/bin/tests/system/nsec/ns3/named.conf.j2
@@ -14,6 +14,8 @@ options {
        max-records-per-type 2;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
         type hint;
         file "../../_common/root.hint";

diff --git a/bin/tests/system/nsec3/ns4/named.conf.j2 b/bin/tests/system/nsec3/ns4/named.conf.j2
index 938d6687b8669f0c61e4068279784ca50137f2e9..83a3e1bb3c9335c7c53f32fb6d45b9bec1ad0cf7 100644 (file)
--- a/bin/tests/system/nsec3/ns4/named.conf.j2
+++ b/bin/tests/system/nsec3/ns4/named.conf.j2
@@ -13,6 +13,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 remote-servers "ns3" {
        10.53.0.3 port @PORT@;
 };

diff --git a/bin/tests/system/nsec3/ns5/named.conf.j2 b/bin/tests/system/nsec3/ns5/named.conf.j2
index f12ff649ac1ad7d9918d60af65c3f7bab193881b..deec62de8cede4c14dcb72ec6ff9ecd25b7d0587 100644 (file)
--- a/bin/tests/system/nsec3/ns5/named.conf.j2
+++ b/bin/tests/system/nsec3/ns5/named.conf.j2
@@ -14,6 +14,8 @@ options {
        send-cookie no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 trust-anchors {
     evil.test. static-key 257 3 13 "yh1W7zgrqOsAZdKAh597SI7F2ye4ReiLmBNsDg+TDLJQ+3C2fXfrsQyY MvA+hmzTQdKX24zlVlD3YAVA6+VmrQ==";
 };

diff --git a/bin/tests/system/nsec3/ns6/named.conf.j2 b/bin/tests/system/nsec3/ns6/named.conf.j2
index 9093e6d2bd7d193457df606d2cdea558b6e28148..7be0738383a78337662fb974cb04b004433d0bc6 100644 (file)
--- a/bin/tests/system/nsec3/ns6/named.conf.j2
+++ b/bin/tests/system/nsec3/ns6/named.conf.j2
@@ -13,6 +13,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "evil.test" {
     type primary;
     file "evil.test.db.signed";

diff --git a/bin/tests/system/nslimit_outdomain/ns1/named.conf.j2 b/bin/tests/system/nslimit_outdomain/ns1/named.conf.j2
index fd83fc3c196e82cfc69cc41263fd74e3d9c1765a..987693a98b6c9941c0b6d32b20865b1a68430912 100644 (file)
--- a/bin/tests/system/nslimit_outdomain/ns1/named.conf.j2
+++ b/bin/tests/system/nslimit_outdomain/ns1/named.conf.j2
@@ -22,6 +22,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db";

diff --git a/bin/tests/system/nslimit_outdomain/ns2/named.conf.j2 b/bin/tests/system/nslimit_outdomain/ns2/named.conf.j2
index 037ac60fe07cbdccbb26c8def6a4baf723985415..f1d7a2e83333b499677eda7c0a8e105cb06978fa 100644 (file)
--- a/bin/tests/system/nslimit_outdomain/ns2/named.conf.j2
+++ b/bin/tests/system/nslimit_outdomain/ns2/named.conf.j2
@@ -30,6 +30,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "tld." {
        type primary;
        file "tld.db";

diff --git a/bin/tests/system/nslimit_outdomain/ns3/named.conf.j2 b/bin/tests/system/nslimit_outdomain/ns3/named.conf.j2
index f7e03a82e76ba34a5f76364f528bb0e38d441199..75df06ea6dc3dae59658c86666990cd90b9cb698 100644 (file)
--- a/bin/tests/system/nslimit_outdomain/ns3/named.conf.j2
+++ b/bin/tests/system/nslimit_outdomain/ns3/named.conf.j2
@@ -24,6 +24,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "example4.tld." {
        type primary;
        file "example4.tld.db";

diff --git a/bin/tests/system/nslookup/ns1/named.conf.j2 b/bin/tests/system/nslookup/ns1/named.conf.j2
index 5e63f8a07c3c1c96ebad8de805fb955c4b6490f2..3a5a0a027525f78f75fae1aeddefc9c31fd3f272 100644 (file)
--- a/bin/tests/system/nslookup/ns1/named.conf.j2
+++ b/bin/tests/system/nslookup/ns1/named.conf.j2
@@ -10,6 +10,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "example" {
        type primary;
        file "example.db";

diff --git a/bin/tests/system/nta/ns1/named.conf.j2 b/bin/tests/system/nta/ns1/named.conf.j2
index d8fa84e94ea4fde08a0c3c6132dd40686e7082e3..04d6f7dfbb40ccb07c817a940a61fc2dc238dce0 100644 (file)
--- a/bin/tests/system/nta/ns1/named.conf.j2
+++ b/bin/tests/system/nta/ns1/named.conf.j2
@@ -15,6 +15,8 @@ options {
        trust-anchor-telemetry no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db.signed";

diff --git a/bin/tests/system/pending/ns1/named.conf.j2 b/bin/tests/system/pending/ns1/named.conf.j2
index 86d9f94d8e4dd3ffb2a957f43374d09d864a706c..1b6058a1e5b444f959f19363b11392ebf9a9258f 100644 (file)
--- a/bin/tests/system/pending/ns1/named.conf.j2
+++ b/bin/tests/system/pending/ns1/named.conf.j2
@@ -12,6 +12,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db.signed";

diff --git a/bin/tests/system/pending/ns2/named.conf.j2 b/bin/tests/system/pending/ns2/named.conf.j2
index 454bbd05abf5aa983aabc78c29d9a008191d4aae..139b79936c14236acc579930fde80bd4843c84f0 100644 (file)
--- a/bin/tests/system/pending/ns2/named.conf.j2
+++ b/bin/tests/system/pending/ns2/named.conf.j2
@@ -15,6 +15,8 @@ options {
        dnssec-validation yes;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type hint;
        file "../../_common/root.hint";

diff --git a/bin/tests/system/pending/ns3/named.conf.j2 b/bin/tests/system/pending/ns3/named.conf.j2
index ce879474e66d7f2ddf301bb039be870adbcd24b7..3443c5cbee958d9935262048ecf6c965285f3e35 100644 (file)
--- a/bin/tests/system/pending/ns3/named.conf.j2
+++ b/bin/tests/system/pending/ns3/named.conf.j2
@@ -15,6 +15,8 @@ options {
        dnssec-validation yes;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type hint;
        file "../../_common/root.hint";

diff --git a/bin/tests/system/pending/ns4/named.conf.j2 b/bin/tests/system/pending/ns4/named.conf.j2
index 3d26b39e48308398ca031aa30288136ac35db03c..357672b9589195963915b0d3431ec87b057ff8fa 100644 (file)
--- a/bin/tests/system/pending/ns4/named.conf.j2
+++ b/bin/tests/system/pending/ns4/named.conf.j2
@@ -12,6 +12,8 @@ options {
        dnssec-validation yes;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type hint;
        file "../../_common/root.hint";

diff --git a/bin/tests/system/qmin/ns1/named.conf.j2 b/bin/tests/system/qmin/ns1/named.conf.j2
index edc0892b3d00d9c25cd891ecb2cf54095a61ba8e..22c124ba0f25bed2e3b281962ffe2493e7740b7d 100644 (file)
--- a/bin/tests/system/qmin/ns1/named.conf.j2
+++ b/bin/tests/system/qmin/ns1/named.conf.j2
@@ -13,6 +13,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db";

diff --git a/bin/tests/system/randomizens/ns1/named.conf.j2 b/bin/tests/system/randomizens/ns1/named.conf.j2
index 237e29805fbfc326e6c970006d2d6a1a42c45b6b..49dbe6cbeab0aa5e122cfcc82ee8ea3c91d778bd 100644 (file)
--- a/bin/tests/system/randomizens/ns1/named.conf.j2
+++ b/bin/tests/system/randomizens/ns1/named.conf.j2
@@ -10,6 +10,8 @@ options {
        notify yes;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db";

diff --git a/bin/tests/system/reclimit/ns1/named.conf.j2 b/bin/tests/system/reclimit/ns1/named.conf.j2
index f665d3c913daa1462423ae004d76584d9de971e5..1a3b89bd0f37c7cc4e5de04b9ed3bd134507d63b 100644 (file)
--- a/bin/tests/system/reclimit/ns1/named.conf.j2
+++ b/bin/tests/system/reclimit/ns1/named.conf.j2
@@ -13,6 +13,8 @@ options {
        max-types-per-name 0;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." { type primary; file "root.db"; };
 
 zone "big." {

diff --git a/bin/tests/system/redirect/ns1/named.conf.j2 b/bin/tests/system/redirect/ns1/named.conf.j2
index fa99ecb4529a7e17fd74b4253a5a5ec5bec17290..e402dde16a576a17fa84e0d18714fc6f6bb57fcd 100644 (file)
--- a/bin/tests/system/redirect/ns1/named.conf.j2
+++ b/bin/tests/system/redirect/ns1/named.conf.j2
@@ -15,6 +15,7 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
 
 zone "." {
        type primary;

diff --git a/bin/tests/system/redirect/ns10/named.conf.j2 b/bin/tests/system/redirect/ns10/named.conf.j2
index 9e019cc5173023a8977d9411bda7ce712bca18f0..7a0ea44d3fb3ded5497a37256aa645054414475d 100644 (file)
--- a/bin/tests/system/redirect/ns10/named.conf.j2
+++ b/bin/tests/system/redirect/ns10/named.conf.j2
@@ -16,6 +16,8 @@ options {
        };
 };
 
+{% include "_common/controls.conf.j2" %}
+
 include "trusted.conf";
 
 zone "." {

diff --git a/bin/tests/system/redirect/ns3/named.conf.j2 b/bin/tests/system/redirect/ns3/named.conf.j2
index 7ceb49f78d5cac63a0017127cdad175bf4f3c4e2..72992a5f50a4f9beea8c384053ac978175b8ecd0 100644 (file)
--- a/bin/tests/system/redirect/ns3/named.conf.j2
+++ b/bin/tests/system/redirect/ns3/named.conf.j2
@@ -13,6 +13,7 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
 
 zone "." {
        type primary;

diff --git a/bin/tests/system/redirect/ns5/named.conf.j2 b/bin/tests/system/redirect/ns5/named.conf.j2
index dcf90f410fa8c81c113b86c91f1471403f8d9b4c..4a3374083e720ab63d1ef54bc22c8cd23ee2d7ec 100644 (file)
--- a/bin/tests/system/redirect/ns5/named.conf.j2
+++ b/bin/tests/system/redirect/ns5/named.conf.j2
@@ -8,6 +8,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
         type primary;
         file "root.db.signed";

diff --git a/bin/tests/system/redirect/ns6/named.conf.j2 b/bin/tests/system/redirect/ns6/named.conf.j2
index a521a6b95af2b046e1e09f594200d41a39d5016d..18bdc770245bf93e6a57ea6a0753d8f820a5f83d 100644 (file)
--- a/bin/tests/system/redirect/ns6/named.conf.j2
+++ b/bin/tests/system/redirect/ns6/named.conf.j2
@@ -8,6 +8,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
         type primary;
         file "root.db";

diff --git a/bin/tests/system/redirect/ns7/named.conf.j2 b/bin/tests/system/redirect/ns7/named.conf.j2
index 0ceb769ac0f1c22cf7ece5054637be91bbe458ce..acdca57fd2ad9eac0c4cd6a13fdf338a1ba2207e 100644 (file)
--- a/bin/tests/system/redirect/ns7/named.conf.j2
+++ b/bin/tests/system/redirect/ns7/named.conf.j2
@@ -13,6 +13,8 @@ options {
        };
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
         type primary;
         file "root.db";

diff --git a/bin/tests/system/redirect/ns8/named.conf.j2 b/bin/tests/system/redirect/ns8/named.conf.j2
index d1513b31bba6c999b80dacea223ee1c918681c21..92ffea0d4660019c292885300e5c81b06cf8b8f7 100644 (file)
--- a/bin/tests/system/redirect/ns8/named.conf.j2
+++ b/bin/tests/system/redirect/ns8/named.conf.j2
@@ -13,6 +13,8 @@ options {
        };
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
         type hint;
         file "root.hints";

diff --git a/bin/tests/system/redirect/ns9/named.conf.j2 b/bin/tests/system/redirect/ns9/named.conf.j2
index 1001396a4436c236caec6c2d9374ed55485310da..583c8cc0c21d4cc2186c49a41f4a613c19647ba9 100644 (file)
--- a/bin/tests/system/redirect/ns9/named.conf.j2
+++ b/bin/tests/system/redirect/ns9/named.conf.j2
@@ -9,6 +9,8 @@ options {
        recursion no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db.signed";

diff --git a/bin/tests/system/resend_loop/ns1/named.conf.j2 b/bin/tests/system/resend_loop/ns1/named.conf.j2
index 4ef0c35531b2fe0bdecd69bb621315a5c448f15a..23ce10ae0b464a6a1b39491b149d4de132041037 100644 (file)
--- a/bin/tests/system/resend_loop/ns1/named.conf.j2
+++ b/bin/tests/system/resend_loop/ns1/named.conf.j2
@@ -11,3 +11,5 @@ options {
        forwarders { 10.53.0.3 port @PORT@; };
        forward only;
 };
+
+{% include "_common/controls.conf.j2" %}

diff --git a/bin/tests/system/resend_loop/ns4/named.conf.j2 b/bin/tests/system/resend_loop/ns4/named.conf.j2
index e686eaaa42f08f00dfdc9310ef52d24eaca4ee56..86c074af8a7e00d6ccd4d4e60e0d24c974821cbd 100644 (file)
--- a/bin/tests/system/resend_loop/ns4/named.conf.j2
+++ b/bin/tests/system/resend_loop/ns4/named.conf.j2
@@ -11,6 +11,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." IN {
        type hint;
        file "root.hint";

diff --git a/bin/tests/system/resolver/ns11/named.conf.j2 b/bin/tests/system/resolver/ns11/named.conf.j2
index d2b13c476bcf30c21db794c12179c3af1ff5eb1d..ccccce2ba03f5487c1e8a1a9cd8b8bc87209668e 100644 (file)
--- a/bin/tests/system/resolver/ns11/named.conf.j2
+++ b/bin/tests/system/resolver/ns11/named.conf.j2
@@ -10,3 +10,5 @@ options {
        dnssec-validation no;
        minimal-any no;
 };
+
+{% include "_common/controls.conf.j2" %}

diff --git a/bin/tests/system/rollover/ns1/named.conf.j2 b/bin/tests/system/rollover/ns1/named.conf.j2
index 092df1994043238fb6d15b7f87a21c043ca09b2f..6822276f08d935be9cbf9e39bcab425d73494c7a 100644 (file)
--- a/bin/tests/system/rollover/ns1/named.conf.j2
+++ b/bin/tests/system/rollover/ns1/named.conf.j2
@@ -12,6 +12,8 @@ options {
        notify yes;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db.signed";

diff --git a/bin/tests/system/rootkeysentinel/ns1/named.conf.j2 b/bin/tests/system/rootkeysentinel/ns1/named.conf.j2
index 7c45a46235aac4c1dc8069dbb62e83f85df15eb1..b2126e0f77aedd12375a0a8c51dbe580a505c052 100644 (file)
--- a/bin/tests/system/rootkeysentinel/ns1/named.conf.j2
+++ b/bin/tests/system/rootkeysentinel/ns1/named.conf.j2
@@ -11,6 +11,8 @@ options {
        dnssec-validation yes;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db.signed";

diff --git a/bin/tests/system/rootkeysentinel/ns2/named.conf.j2 b/bin/tests/system/rootkeysentinel/ns2/named.conf.j2
index 6166771083ad16f9d0be583e97740638f56ee30d..3450bbd7c50521c0f049d1d98e26aedfd74a32ba 100644 (file)
--- a/bin/tests/system/rootkeysentinel/ns2/named.conf.j2
+++ b/bin/tests/system/rootkeysentinel/ns2/named.conf.j2
@@ -11,6 +11,8 @@ options {
        dnssec-validation yes;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "example" {
        type primary;
        file "example.db.signed";

diff --git a/bin/tests/system/rootkeysentinel/ns3/named.conf.j2 b/bin/tests/system/rootkeysentinel/ns3/named.conf.j2
index da5b74ce430c69e5a2ef64b4c79b21d079d62327..b1d5efa246f14cb0cb3e50242b52f7bd03f12eae 100644 (file)
--- a/bin/tests/system/rootkeysentinel/ns3/named.conf.j2
+++ b/bin/tests/system/rootkeysentinel/ns3/named.conf.j2
@@ -12,6 +12,8 @@ options {
        root-key-sentinel yes;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type hint;
        file "hint.db";

diff --git a/bin/tests/system/rootkeysentinel/ns4/named.conf.j2 b/bin/tests/system/rootkeysentinel/ns4/named.conf.j2
index 2755f6fef2b55b4d0b5a7f83a929dca4bad13697..81c6648918da7395c71ca263bda9125eab509871 100644 (file)
--- a/bin/tests/system/rootkeysentinel/ns4/named.conf.j2
+++ b/bin/tests/system/rootkeysentinel/ns4/named.conf.j2
@@ -12,6 +12,8 @@ options {
        root-key-sentinel no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type hint;
        file "hint.db";

diff --git a/bin/tests/system/rrl/ns1/named.conf.j2 b/bin/tests/system/rrl/ns1/named.conf.j2
index a29c8b4fbe979bf9564d50a68b77acd5ab150467..18ba41563326b342349ba7154a9d401d25ce0915 100644 (file)
--- a/bin/tests/system/rrl/ns1/named.conf.j2
+++ b/bin/tests/system/rrl/ns1/named.conf.j2
@@ -12,5 +12,6 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
 
 zone "." {type primary; file "root.db";};

diff --git a/bin/tests/system/rrl/ns3/named.conf.j2 b/bin/tests/system/rrl/ns3/named.conf.j2
index fb3cba9dcc8a05ebfe67254eeb1c1f3c761c2c16..20fff8ff6468dfb9ccf09c560c6378befbed08c9 100644 (file)
--- a/bin/tests/system/rrl/ns3/named.conf.j2
+++ b/bin/tests/system/rrl/ns3/named.conf.j2
@@ -30,6 +30,7 @@ options {
 
 };
 
+{% include "_common/controls.conf.j2" %}
 
 zone "." { type hint; file "hints"; };
 

diff --git a/bin/tests/system/rrsetorder/ns1/named.conf.j2 b/bin/tests/system/rrsetorder/ns1/named.conf.j2
index 56a38e49d22e0e65ce348e94e578296967f3c6c7..f200b44eeb78731bfd0f877ef23a4e10856ebe70 100644 (file)
--- a/bin/tests/system/rrsetorder/ns1/named.conf.j2
+++ b/bin/tests/system/rrsetorder/ns1/named.conf.j2
@@ -18,6 +18,8 @@ options {
        };
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db";

diff --git a/bin/tests/system/rrsetorder/ns2/named.conf.j2 b/bin/tests/system/rrsetorder/ns2/named.conf.j2
index 739183d14545baca8065a2e4ac6f86e2b3c39222..99f77d8e174b6fbf4d06a378b53d6fbe5a487015 100644 (file)
--- a/bin/tests/system/rrsetorder/ns2/named.conf.j2
+++ b/bin/tests/system/rrsetorder/ns2/named.conf.j2
@@ -18,6 +18,8 @@ options {
        };
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type secondary;
        primaries { 10.53.0.1; };

diff --git a/bin/tests/system/rrsetorder/ns3/named.conf.j2 b/bin/tests/system/rrsetorder/ns3/named.conf.j2
index 2fa8c08db3001defde47bc7d72090e2d4a03b87f..0f45d2ccaa98383671a4e1a7a9a689b5153f2e98 100644 (file)
--- a/bin/tests/system/rrsetorder/ns3/named.conf.j2
+++ b/bin/tests/system/rrsetorder/ns3/named.conf.j2
@@ -18,6 +18,7 @@ options {
        };
 };
 
+{% include "_common/controls.conf.j2" %}
 
 zone "." {
        type hint;

diff --git a/bin/tests/system/rrsetorder/ns4/named.conf.j2 b/bin/tests/system/rrsetorder/ns4/named.conf.j2
index 4941c353c2ba8c2467f3d08eb6ff2f2bf66cc6a5..3a246084f4a248e002f30eccc118485b4aef7de9 100644 (file)
--- a/bin/tests/system/rrsetorder/ns4/named.conf.j2
+++ b/bin/tests/system/rrsetorder/ns4/named.conf.j2
@@ -15,6 +15,7 @@ options {
 
 };
 
+{% include "_common/controls.conf.j2" %}
 
 zone "." {
        type hint;

diff --git a/bin/tests/system/rrsetorder/ns5/named.conf.j2 b/bin/tests/system/rrsetorder/ns5/named.conf.j2
index 502563131e44029b05b3a0ca45674c7c8a5272fa..84355fe4f58aa137c3c84e3c7976d53d6f5a3ae3 100644 (file)
--- a/bin/tests/system/rrsetorder/ns5/named.conf.j2
+++ b/bin/tests/system/rrsetorder/ns5/named.conf.j2
@@ -11,6 +11,7 @@ options {
        notify yes;
 };
 
+{% include "_common/controls.conf.j2" %}
 
 zone "." {
        type hint;

diff --git a/bin/tests/system/rsabigexponent/ns1/named.conf.j2 b/bin/tests/system/rsabigexponent/ns1/named.conf.j2
index 85cd432f8d8a138626891f669b168885b5035428..166e79fa1d4b363bee3d3580348b7de402a459a4 100644 (file)
--- a/bin/tests/system/rsabigexponent/ns1/named.conf.j2
+++ b/bin/tests/system/rsabigexponent/ns1/named.conf.j2
@@ -13,6 +13,8 @@ options {
        dnssec-validation yes;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db.signed";

diff --git a/bin/tests/system/rsabigexponent/ns2/named.conf.j2 b/bin/tests/system/rsabigexponent/ns2/named.conf.j2
index 6b7884c4691ba776c9862546e6cd97cace446ce7..128b3c428702b94f9581339ffe95c04233a775d5 100644 (file)
--- a/bin/tests/system/rsabigexponent/ns2/named.conf.j2
+++ b/bin/tests/system/rsabigexponent/ns2/named.conf.j2
@@ -13,6 +13,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type hint;
        file "../../_common/root.hint";

diff --git a/bin/tests/system/runtime/ns2/named2.conf.j2 b/bin/tests/system/runtime/ns2/named2.conf.j2
index 76fcbead8a58dff6c6ec7b19c2eef3fc566ec850..bdef0b33e17e3e982435290475ff2424da10e5c7 100644 (file)
--- a/bin/tests/system/runtime/ns2/named2.conf.j2
+++ b/bin/tests/system/runtime/ns2/named2.conf.j2
@@ -7,3 +7,5 @@ options {
        recursion no;
        dnssec-validation no;
 };
+
+{% include "_common/controls.conf.j2" %}

diff --git a/bin/tests/system/runtime/ns2/named3.conf.j2 b/bin/tests/system/runtime/ns2/named3.conf.j2
index c05d82b4d3954ffb471160039a742f0929e14fd3..d65d2dc441d3393b52a2a6b983c7660d39b614c2 100644 (file)
--- a/bin/tests/system/runtime/ns2/named3.conf.j2
+++ b/bin/tests/system/runtime/ns2/named3.conf.j2
@@ -7,3 +7,5 @@ options {
        recursion no;
        dnssec-validation no;
 };
+
+{% include "_common/controls.conf.j2" %}

diff --git a/bin/tests/system/runtime/ns2/named4.conf.j2 b/bin/tests/system/runtime/ns2/named4.conf.j2
index 1de369c9a0d81634f0fc8ee1ac7948c9fa9a7d41..24074e78f6deaee91101643af802300a4e508980 100644 (file)
--- a/bin/tests/system/runtime/ns2/named4.conf.j2
+++ b/bin/tests/system/runtime/ns2/named4.conf.j2
@@ -7,3 +7,5 @@ options {
        recursion no;
        dnssec-validation no;
 };
+
+{% include "_common/controls.conf.j2" %}

diff --git a/bin/tests/system/runtime/ns2/named5.conf.j2 b/bin/tests/system/runtime/ns2/named5.conf.j2
index cf897a04a32b84134a71f24ecfa941fd526d3e92..1c4f1e04f7333af19f09f258a60cd854475da36a 100644 (file)
--- a/bin/tests/system/runtime/ns2/named5.conf.j2
+++ b/bin/tests/system/runtime/ns2/named5.conf.j2
@@ -5,3 +5,5 @@ options {
        listen-on-v6 { fd92:7065:b8e:ffff::2; };
        dnssec-validation no;
 };
+
+{% include "_common/controls.conf.j2" %}

diff --git a/bin/tests/system/runtime/ns2/named6.conf.j2 b/bin/tests/system/runtime/ns2/named6.conf.j2
index 632221f3b0e483606dc056f6d3600aed56580f72..ff624ce11e9b0532bf62b7c7b463418ec4ff2d21 100644 (file)
--- a/bin/tests/system/runtime/ns2/named6.conf.j2
+++ b/bin/tests/system/runtime/ns2/named6.conf.j2
@@ -6,6 +6,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "ipv4-only-servers" {
        type secondary;
        primaries { 10.53.0.3; };

diff --git a/bin/tests/system/runtime/ns2/named7.conf.j2 b/bin/tests/system/runtime/ns2/named7.conf.j2
index 1959b3d18c0a6596e07a3af9599bac165e667ffa..f54099868b7a5b6a5e529e1b19fc192e2ee47491 100644 (file)
--- a/bin/tests/system/runtime/ns2/named7.conf.j2
+++ b/bin/tests/system/runtime/ns2/named7.conf.j2
@@ -6,3 +6,5 @@ options {
        recursion no;
        dnssec-validation no;
 };
+
+{% include "_common/controls.conf.j2" %}

diff --git a/bin/tests/system/selfpointedglue/ns1/named.conf.j2 b/bin/tests/system/selfpointedglue/ns1/named.conf.j2
index fd83fc3c196e82cfc69cc41263fd74e3d9c1765a..987693a98b6c9941c0b6d32b20865b1a68430912 100644 (file)
--- a/bin/tests/system/selfpointedglue/ns1/named.conf.j2
+++ b/bin/tests/system/selfpointedglue/ns1/named.conf.j2
@@ -22,6 +22,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db";

diff --git a/bin/tests/system/selfpointedglue/ns2/named.conf.j2 b/bin/tests/system/selfpointedglue/ns2/named.conf.j2
index 2993832da2edcab6bddc7d10c84d7604a8dcf997..080731257f73d924d4a43fdadd744bc8998b2972 100644 (file)
--- a/bin/tests/system/selfpointedglue/ns2/named.conf.j2
+++ b/bin/tests/system/selfpointedglue/ns2/named.conf.j2
@@ -22,6 +22,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "tld." {
        type primary;
        file "tld.db";

diff --git a/bin/tests/system/selfpointedglue/ns3/named.conf.j2 b/bin/tests/system/selfpointedglue/ns3/named.conf.j2
index 0c50ca8658928f4057940624ff4c09178320728a..366a9479b319522e0770b4c65d155cbac726c421 100644 (file)
--- a/bin/tests/system/selfpointedglue/ns3/named.conf.j2
+++ b/bin/tests/system/selfpointedglue/ns3/named.conf.j2
@@ -33,6 +33,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "example.tld." {
        type primary;
        file "example.tld.db";

diff --git a/bin/tests/system/sfcache/ns1/named.conf.j2 b/bin/tests/system/sfcache/ns1/named.conf.j2
index 85cd432f8d8a138626891f669b168885b5035428..166e79fa1d4b363bee3d3580348b7de402a459a4 100644 (file)
--- a/bin/tests/system/sfcache/ns1/named.conf.j2
+++ b/bin/tests/system/sfcache/ns1/named.conf.j2
@@ -13,6 +13,8 @@ options {
        dnssec-validation yes;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db.signed";

diff --git a/bin/tests/system/sfcache_cname/ns1/named.conf.j2 b/bin/tests/system/sfcache_cname/ns1/named.conf.j2
index 9f2271e70920e6aec751b9c5e931a588af6a10a3..88617a89c699b770f5fe8535ffeac20bf581bf62 100644 (file)
--- a/bin/tests/system/sfcache_cname/ns1/named.conf.j2
+++ b/bin/tests/system/sfcache_cname/ns1/named.conf.j2
@@ -10,6 +10,8 @@ options {
     dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
     type primary;
     file "root.db";

diff --git a/bin/tests/system/sfcache_cname/ns2/named.conf.j2 b/bin/tests/system/sfcache_cname/ns2/named.conf.j2
index 8bc955aceb5931c7ca59019797bb841800456a20..4fb0b54296a7edd4a11ede7e39772cd4fd0a9590 100644 (file)
--- a/bin/tests/system/sfcache_cname/ns2/named.conf.j2
+++ b/bin/tests/system/sfcache_cname/ns2/named.conf.j2
@@ -11,6 +11,8 @@ options {
        max-query-count 2;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "tld1." {
        type static-stub;
        server-addresses { 10.53.0.1; };

diff --git a/bin/tests/system/spf/ns1/named.conf.j2 b/bin/tests/system/spf/ns1/named.conf.j2
index 1be3fff34a33c40168cef61b048e9df4c9f3920c..a0a410d24b90870404d895121132f567faab82ea 100644 (file)
--- a/bin/tests/system/spf/ns1/named.conf.j2
+++ b/bin/tests/system/spf/ns1/named.conf.j2
@@ -12,6 +12,8 @@ options {
        ixfr-from-differences yes;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "spf" {
        type primary;
        file "spf.db";

diff --git a/bin/tests/system/srtt/ns1/named.conf.j2 b/bin/tests/system/srtt/ns1/named.conf.j2
index eb079c95ab8bacd52e4cf9c54a1ecf7f80f3456a..248175c337c26c12b62593858c877ba5415a1be1 100644 (file)
--- a/bin/tests/system/srtt/ns1/named.conf.j2
+++ b/bin/tests/system/srtt/ns1/named.conf.j2
@@ -23,6 +23,8 @@ options {
        notify yes;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db";

diff --git a/bin/tests/system/staticstub/ns1/named.conf.j2 b/bin/tests/system/staticstub/ns1/named.conf.j2
index 4d0a7c6d130240dad5b2577e8c7d6204387011e8..cb43a331348a39faaa6155b23046bf269148fb3c 100644 (file)
--- a/bin/tests/system/staticstub/ns1/named.conf.j2
+++ b/bin/tests/system/staticstub/ns1/named.conf.j2
@@ -9,4 +9,6 @@ options {
        notify no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." { type primary; file "root.db"; };

diff --git a/bin/tests/system/staticstub/ns4/named.conf.j2 b/bin/tests/system/staticstub/ns4/named.conf.j2
index bfcfaae94925f9e648173ab3440000b757a3732c..530e4af37fc96ff2df02a60a75f9bab755fd35c0 100644 (file)
--- a/bin/tests/system/staticstub/ns4/named.conf.j2
+++ b/bin/tests/system/staticstub/ns4/named.conf.j2
@@ -11,6 +11,8 @@ options {
        notify no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "example.com" {
        type primary;
        file "example.com.db";

diff --git a/bin/tests/system/statistics/ns1/named.conf.j2 b/bin/tests/system/statistics/ns1/named.conf.j2
index 7e7e977b22e4832973bfd70e4cbb9520bc0f11af..ed0ede2af33d3cd980147fab9eec5ed2ca96db00 100644 (file)
--- a/bin/tests/system/statistics/ns1/named.conf.j2
+++ b/bin/tests/system/statistics/ns1/named.conf.j2
@@ -11,6 +11,8 @@ options {
        notify yes;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 {% if FEATURE_LIBXML2 == "1" or FEATURE_JSON_C == "1" %}
 statistics-channels {
        inet 10.53.0.1 port @EXTRAPORT1@ allow { any; };

diff --git a/bin/tests/system/stub/ns1/named.conf.j2 b/bin/tests/system/stub/ns1/named.conf.j2
index 36d5c6e9f779fbb29bcd0592691732ac19cbd562..8da1242510ef64c0f221f1f5459d157a23ce0a32 100644 (file)
--- a/bin/tests/system/stub/ns1/named.conf.j2
+++ b/bin/tests/system/stub/ns1/named.conf.j2
@@ -12,6 +12,8 @@ options {
        minimal-responses no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db";

diff --git a/bin/tests/system/stub/ns2/named.conf.j2 b/bin/tests/system/stub/ns2/named.conf.j2
index e6bf52a57208dc539d5ce042c218a70e6480fd8c..46d7c78de69e9a19ac1fbf9bc2f43501cec76026 100644 (file)
--- a/bin/tests/system/stub/ns2/named.conf.j2
+++ b/bin/tests/system/stub/ns2/named.conf.j2
@@ -12,6 +12,8 @@ options {
        minimal-responses no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type hint;
        file "../../_common/root.hint";

diff --git a/bin/tests/system/stub/ns4/named.conf.j2 b/bin/tests/system/stub/ns4/named.conf.j2
index 719c341a131556636d8c4718c8f18fa480b55f6e..83aee968275121c63f38f2b394a107e6fe4dbd9a 100644 (file)
--- a/bin/tests/system/stub/ns4/named.conf.j2
+++ b/bin/tests/system/stub/ns4/named.conf.j2
@@ -12,6 +12,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "example" {
        type primary;
        file "example.db";

diff --git a/bin/tests/system/stub/ns5/named.conf.j2 b/bin/tests/system/stub/ns5/named.conf.j2
index b509f6d1ea4c5b3c570fff2eeb4b78b2948fc20f..d6ca0448246ef960e45e89da2d2c96b486665335 100644 (file)
--- a/bin/tests/system/stub/ns5/named.conf.j2
+++ b/bin/tests/system/stub/ns5/named.conf.j2
@@ -9,6 +9,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type hint;
        file "../../_common/root.hint";

diff --git a/bin/tests/system/tkey/ns1/named.conf.j2 b/bin/tests/system/tkey/ns1/named.conf.j2
index 3556ff5ca57abab7ca53bbd1450135dc496e6626..fed3f3c7973004428e0d89025602548b6e7ef969 100644 (file)
--- a/bin/tests/system/tkey/ns1/named.conf.j2
+++ b/bin/tests/system/tkey/ns1/named.conf.j2
@@ -11,6 +11,8 @@ options {
        notify no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 key "test-key" {
        algorithm "hmac-sha256";
        secret "R16NojROxtxH/xbDl//ehDsHm5DjWTQ2YXV+hGC2iBY=";

diff --git a/bin/tests/system/tsig/ns1/named.conf.j2 b/bin/tests/system/tsig/ns1/named.conf.j2
index 1d2dcd27fc0a7130d358405eef81f16df2f5aaf3..a4afed8c6541b0607f438f1c00f96b4a97ce179b 100644 (file)
--- a/bin/tests/system/tsig/ns1/named.conf.j2
+++ b/bin/tests/system/tsig/ns1/named.conf.j2
@@ -11,6 +11,8 @@ options {
        notify no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 {% if FEATURE_MD5 == "1" %}
 include "named-md5.conf";
 {% endif %}

diff --git a/bin/tests/system/unknown/ns1/named.conf.j2 b/bin/tests/system/unknown/ns1/named.conf.j2
index c5b17c2a27c75ad4472a7dbffc6d809315c8f631..8b2f73ec0a925ebffb66e487d50c638771af1c2f 100644 (file)
--- a/bin/tests/system/unknown/ns1/named.conf.j2
+++ b/bin/tests/system/unknown/ns1/named.conf.j2
@@ -11,6 +11,8 @@ options {
        notify no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 view "in" {
        allow-transfer { any; };
 

diff --git a/bin/tests/system/unknown/ns2/named.conf.j2 b/bin/tests/system/unknown/ns2/named.conf.j2
index 0a722f6c1cdfdcfb77754ee057a3091bfd1e1bac..332fc6e2c6ef74fd78cdf53e1075c9d9e149ade4 100644 (file)
--- a/bin/tests/system/unknown/ns2/named.conf.j2
+++ b/bin/tests/system/unknown/ns2/named.conf.j2
@@ -11,6 +11,8 @@ options {
        notify no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 view "in" {
        zone "example." {
                type secondary;

diff --git a/bin/tests/system/unknown/ns3/named.conf.j2 b/bin/tests/system/unknown/ns3/named.conf.j2
index ee3ba30fff1b208ab36e4910ba9d7cd8ee877935..3900e932c0c48d21cefded99a2a4cff45c31f704 100644 (file)
--- a/bin/tests/system/unknown/ns3/named.conf.j2
+++ b/bin/tests/system/unknown/ns3/named.conf.j2
@@ -11,6 +11,8 @@ options {
        notify no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 dnssec-policy unknown {
        keys {
                ksk key-directory lifetime unlimited algorithm @DEFAULT_ALGORITHM@;

diff --git a/bin/tests/system/upforwd/ns1/named.conf.j2 b/bin/tests/system/upforwd/ns1/named.conf.j2
index e88a09a3a121da9cb6ce295a138065a22c84188a..a729ecfc97435f05858aa49dc039a7e7ce81bc65 100644 (file)
--- a/bin/tests/system/upforwd/ns1/named.conf.j2
+++ b/bin/tests/system/upforwd/ns1/named.conf.j2
@@ -19,6 +19,8 @@ options {
        notify yes;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "example" {
        type primary;
        file "example.db";

diff --git a/bin/tests/system/upforwd/ns2/named.conf.j2 b/bin/tests/system/upforwd/ns2/named.conf.j2
index 3e568df9c0ce9f36f1b7eb2b62290cf2da1efb27..b247793bfaf9b9e4e69aed67f9e5008c24224d5d 100644 (file)
--- a/bin/tests/system/upforwd/ns2/named.conf.j2
+++ b/bin/tests/system/upforwd/ns2/named.conf.j2
@@ -12,6 +12,8 @@ options {
        notify yes;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "example" {
        type secondary;
        file "example.bk";

diff --git a/bin/tests/system/views/ns1/named.conf.j2 b/bin/tests/system/views/ns1/named.conf.j2
index 84ba9e8fc544825001826044a48d0e005d5ff5fd..8d7b125a0c7c163dda7a9c35568a449c235db40f 100644 (file)
--- a/bin/tests/system/views/ns1/named.conf.j2
+++ b/bin/tests/system/views/ns1/named.conf.j2
@@ -11,6 +11,8 @@ options {
        notify yes;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db";

diff --git a/bin/tests/system/wildcard/ns1/named.conf.j2 b/bin/tests/system/wildcard/ns1/named.conf.j2
index bf19cce65325865fc9997375e31f3edf82f7f02e..7679821de2e6dfa93e284855cf911371cce54d14 100644 (file)
--- a/bin/tests/system/wildcard/ns1/named.conf.j2
+++ b/bin/tests/system/wildcard/ns1/named.conf.j2
@@ -11,6 +11,8 @@ options {
        notify yes;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." { type primary; file "root.db.signed"; };
 
 /*

diff --git a/bin/tests/system/wildcard/ns2/named.conf.j2 b/bin/tests/system/wildcard/ns2/named.conf.j2
index c1027bf78aef5a32edb7a32a8162353617e6ad7a..478a1758a9588d5986d0dd1a10e858f537c0708f 100644 (file)
--- a/bin/tests/system/wildcard/ns2/named.conf.j2
+++ b/bin/tests/system/wildcard/ns2/named.conf.j2
@@ -11,6 +11,8 @@ options {
        notify yes;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type hint;
        file "../../_common/root.hint";

diff --git a/bin/tests/system/wildcard/ns3/named.conf.j2 b/bin/tests/system/wildcard/ns3/named.conf.j2
index e5683755119faabb9c18f23639cb574480675b9c..341fd030abc265fbb0d9545e47ab30770ccb2ed8 100644 (file)
--- a/bin/tests/system/wildcard/ns3/named.conf.j2
+++ b/bin/tests/system/wildcard/ns3/named.conf.j2
@@ -11,6 +11,8 @@ options {
        notify yes;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 include "../ns1/trusted.conf";
 
 zone "." {

diff --git a/bin/tests/system/wildcard/ns4/named.conf.j2 b/bin/tests/system/wildcard/ns4/named.conf.j2
index 49dc6175acce0b989d94f80ecf2b822a38189989..bc35691c3118a6bd1bd4b02742fec9ab8e5581de 100644 (file)
--- a/bin/tests/system/wildcard/ns4/named.conf.j2
+++ b/bin/tests/system/wildcard/ns4/named.conf.j2
@@ -13,6 +13,8 @@ options {
        forwarders { 10.53.0.2; };
 };
 
+{% include "_common/controls.conf.j2" %}
+
 include "../ns1/trusted.conf";
 include "../ns1/private.nsec.conf";
 include "../ns1/private.nsec3.conf";

diff --git a/bin/tests/system/wildcard/ns5/named.conf.j2 b/bin/tests/system/wildcard/ns5/named.conf.j2
index e83c1ea91a5030cfe891222a2f7f246bb8212120..98e487ef98df77f059a9d6d08348622c54562b64 100644 (file)
--- a/bin/tests/system/wildcard/ns5/named.conf.j2
+++ b/bin/tests/system/wildcard/ns5/named.conf.j2
@@ -11,6 +11,8 @@ options {
        notify yes;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 include "../ns1/trusted.conf";
 
 zone "." {

diff --git a/bin/tests/system/xferquota/ns2/named.conf.j2 b/bin/tests/system/xferquota/ns2/named.conf.j2
index 43d32d7442a22aa5f81c9966af07f7ed99bd1612..66edc6a4d7a451d03647119605897fadb2e1a454 100644 (file)
--- a/bin/tests/system/xferquota/ns2/named.conf.j2
+++ b/bin/tests/system/xferquota/ns2/named.conf.j2
@@ -15,6 +15,8 @@ options {
        transfers-per-ns 5;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type hint;
        file "../../_common/root.hint";

diff --git a/bin/tests/system/zero/ns1/named.conf.j2 b/bin/tests/system/zero/ns1/named.conf.j2
index f78a62a9bdc5525b28503e4ad12a4db5b0076b94..0cc901254d08438b15768f1a84b626db4afa755a 100644 (file)
--- a/bin/tests/system/zero/ns1/named.conf.j2
+++ b/bin/tests/system/zero/ns1/named.conf.j2
@@ -10,6 +10,8 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "." {
        type primary;
        file "root.db";

diff --git a/bin/tests/system/zero/ns2/named.conf.j2 b/bin/tests/system/zero/ns2/named.conf.j2
index 9627421cf765c1f35be5ee86921b937402611793..0aea6abe351766f0a08514eed513aa6229803b1f 100644 (file)
--- a/bin/tests/system/zero/ns2/named.conf.j2
+++ b/bin/tests/system/zero/ns2/named.conf.j2
@@ -11,6 +11,8 @@ options {
        allow-transfer { any; };
 };
 
+{% include "_common/controls.conf.j2" %}
+
 zone "example" {
        type primary;
        file "example.db";

diff --git a/bin/tests/system/zero/ns3/named.conf.j2 b/bin/tests/system/zero/ns3/named.conf.j2
index 6503e3d1d9dbd5d13a86bbcaeeaf336776d1981b..8e5ddc56b9aec0ca3fdf4a4663b4bfab820058a6 100644 (file)
--- a/bin/tests/system/zero/ns3/named.conf.j2
+++ b/bin/tests/system/zero/ns3/named.conf.j2
@@ -11,6 +11,7 @@ options {
        servfail-ttl 0;
 };
 
+{% include "_common/controls.conf.j2" %}
 
 zone "." {
        type hint;

diff --git a/bin/tests/system/zero/ns4/named.conf.j2 b/bin/tests/system/zero/ns4/named.conf.j2
index 251849e80ea551acc242704f3eda139c80d808d9..e1f32a8b9629bfeb5e645f0f17564624589cfde2 100644 (file)
--- a/bin/tests/system/zero/ns4/named.conf.j2
+++ b/bin/tests/system/zero/ns4/named.conf.j2
@@ -10,6 +10,7 @@ options {
        dnssec-validation no;
 };
 
+{% include "_common/controls.conf.j2" %}
 
 zone "example" {
        type secondary;