Use the root-hint template for identical hint configs

Replace hand-written root hint zone with the template in cases where it
exactly matches the reference.

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 c67e29d2b794f9cc81ea71686e9286f8150cc04c..b123137245b83db87a7e443b04eb168cab21a2dc 100644 (file)
--- a/bin/tests/system/acl/ns2/named.conf.j2
+++ b/bin/tests/system/acl/ns2/named.conf.j2
@@ -18,10 +18,7 @@ key two {
        secret "1234abcd8765";
 };
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
        type primary;

diff --git a/bin/tests/system/acl/ns2/named2.conf.j2 b/bin/tests/system/acl/ns2/named2.conf.j2
index 0bda32e0fe18e397d5d282eb84f5b2d02a38fe2a..c63fc8e18552aaa1d0d12e093c606b5796f47202 100644 (file)
--- a/bin/tests/system/acl/ns2/named2.conf.j2
+++ b/bin/tests/system/acl/ns2/named2.conf.j2
@@ -18,10 +18,7 @@ key two {
        secret "1234abcd8765";
 };
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
        type primary;

diff --git a/bin/tests/system/acl/ns2/named3.conf.j2 b/bin/tests/system/acl/ns2/named3.conf.j2
index 92d26f7671d8c82fd9d964001e1958dfecfea291..ea1b90db79ca059cb22d9f7d2b6d0874c26ebd7f 100644 (file)
--- a/bin/tests/system/acl/ns2/named3.conf.j2
+++ b/bin/tests/system/acl/ns2/named3.conf.j2
@@ -31,10 +31,7 @@ acl accept {
        10.53.0.1; 10.53.0.2;
 };
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
        type primary;

diff --git a/bin/tests/system/acl/ns2/named4.conf.j2 b/bin/tests/system/acl/ns2/named4.conf.j2
index a853cd4e793a5e716cb7514cbbb22656836a9a29..db2ca0cb594fde55a52535b3b92fefc5dd2909ae 100644 (file)
--- a/bin/tests/system/acl/ns2/named4.conf.j2
+++ b/bin/tests/system/acl/ns2/named4.conf.j2
@@ -30,10 +30,7 @@ acl check1 { !key one; 10.53.0.1; };
 
 acl check2 { !key two; 10.53.0.2; };
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
        type primary;

diff --git a/bin/tests/system/acl/ns2/named5.conf.j2 b/bin/tests/system/acl/ns2/named5.conf.j2
index baad0db74eca22d3d1449f883951d9e2351985cd..ea34e269d0fb7a64cecee3de09ba41cf5497c4cb 100644 (file)
--- a/bin/tests/system/acl/ns2/named5.conf.j2
+++ b/bin/tests/system/acl/ns2/named5.conf.j2
@@ -20,10 +20,7 @@ key two {
        secret "1234abcd8765";
 };
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
        type primary;

diff --git a/bin/tests/system/addzone/ns1/named.conf.j2 b/bin/tests/system/addzone/ns1/named.conf.j2
index 09f9c44dbd5f301e46a58e658e5f25f0812a86b7..add20e6ce34d41fc77b9e3c43e29f21764517de5 100644 (file)
--- a/bin/tests/system/addzone/ns1/named.conf.j2
+++ b/bin/tests/system/addzone/ns1/named.conf.j2
@@ -15,10 +15,7 @@ options {
        dnssec-validation no;
 };
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "inlinesec.example" {
        type primary;

diff --git a/bin/tests/system/addzone/ns2/named.conf.j2 b/bin/tests/system/addzone/ns2/named.conf.j2
index 5f909bcb656e79b139087f805f2acef041882746..4772e26e66e6eaf05e81fd73345f93dcef9cc127 100644 (file)
--- a/bin/tests/system/addzone/ns2/named.conf.j2
+++ b/bin/tests/system/addzone/ns2/named.conf.j2
@@ -23,10 +23,7 @@ template bad {
        min-retry-time 0;
 };
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "normal.example" {
        type primary;

diff --git a/bin/tests/system/allow_query/ns2/named.conf.j2 b/bin/tests/system/allow_query/ns2/named.conf.j2
index 038fc32c3398cbf4e179db51685581790dc602d7..e00efc044fe638388274573a516c1dc8722f8430 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named.conf.j2
@@ -6,10 +6,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "normal.example" {
        type primary;

diff --git a/bin/tests/system/allow_query/ns2/named02.conf.j2 b/bin/tests/system/allow_query/ns2/named02.conf.j2
index b300cbe2ca9c8dc9cafc9901fb3fca1fbc4b978f..77982b2055595327f62270f549143deb043e7a73 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named02.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named02.conf.j2
@@ -7,10 +7,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "normal.example" {
        type primary;

diff --git a/bin/tests/system/allow_query/ns2/named03.conf.j2 b/bin/tests/system/allow_query/ns2/named03.conf.j2
index ceacd8992b3dbaa4f7b35f7cd79b78fd99a6ebe4..421d60968f52dacac8a1bd6429e152a3190be97c 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named03.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named03.conf.j2
@@ -7,10 +7,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "normal.example" {
        type primary;

diff --git a/bin/tests/system/allow_query/ns2/named04.conf.j2 b/bin/tests/system/allow_query/ns2/named04.conf.j2
index 96f0581e4f66b81f9d91c920d750dd5336e1c9a7..10626932627aa804eee537ead826dba430dfbe3b 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named04.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named04.conf.j2
@@ -7,10 +7,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "normal.example" {
        type primary;

diff --git a/bin/tests/system/allow_query/ns2/named05.conf.j2 b/bin/tests/system/allow_query/ns2/named05.conf.j2
index 3d5a7308877df18414122acdec5af3457e9818e2..c40797e1f2770d2b90a34c1896d1f8bc0d5602f1 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named05.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named05.conf.j2
@@ -7,10 +7,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "normal.example" {
        type primary;

diff --git a/bin/tests/system/allow_query/ns2/named06.conf.j2 b/bin/tests/system/allow_query/ns2/named06.conf.j2
index a80954685bed1594195df63ce4379f7144c7b198..223ee6ad09a6e9313e68e54d1750cc4f27c530ae 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named06.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named06.conf.j2
@@ -7,10 +7,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "normal.example" {
        type primary;

diff --git a/bin/tests/system/allow_query/ns2/named07.conf.j2 b/bin/tests/system/allow_query/ns2/named07.conf.j2
index b2dfcec378753745591a6b8c7667a766261b954b..f8128756f88e53f0af92546ef3922cbb75516fb3 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named07.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named07.conf.j2
@@ -9,10 +9,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "normal.example" {
        type primary;

diff --git a/bin/tests/system/allow_query/ns2/named08.conf.j2 b/bin/tests/system/allow_query/ns2/named08.conf.j2
index d90a8f5dcc62529dc3753b0e6d781dccefe0362f..7dd1ac224547549e726243f1c931579b1721179a 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named08.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named08.conf.j2
@@ -9,10 +9,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "normal.example" {
        type primary;

diff --git a/bin/tests/system/allow_query/ns2/named09.conf.j2 b/bin/tests/system/allow_query/ns2/named09.conf.j2
index 4601cf3b77589c079edd27e5feca0fef80d94f9e..95a991baf450967baedb1689ecaa8b8781724736 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named09.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named09.conf.j2
@@ -9,10 +9,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "normal.example" {
        type primary;

diff --git a/bin/tests/system/allow_query/ns2/named10.conf.j2 b/bin/tests/system/allow_query/ns2/named10.conf.j2
index 51f7317853d3a8636f49e52056f3d83dad95be98..6fa5a4e324fa31236a650589402184d1f3a48541 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named10.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named10.conf.j2
@@ -12,10 +12,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "normal.example" {
        type primary;

diff --git a/bin/tests/system/allow_query/ns2/named11.conf.j2 b/bin/tests/system/allow_query/ns2/named11.conf.j2
index a6b9fc3a517e2e08c4a165ec42c7d0dcc0292110..025613b701256881938efb2303ccaaff6a9d8e11 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named11.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named11.conf.j2
@@ -18,10 +18,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "normal.example" {
        type primary;

diff --git a/bin/tests/system/allow_query/ns2/named12.conf.j2 b/bin/tests/system/allow_query/ns2/named12.conf.j2
index 1dd296d7f1cbe6d16a6e9e2facda197454abeffb..ec0c214df316a45b2a45afd2f10bb48a230675bc 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named12.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named12.conf.j2
@@ -12,10 +12,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "normal.example" {
        type primary;

diff --git a/bin/tests/system/allow_query/ns2/named40.conf.j2 b/bin/tests/system/allow_query/ns2/named40.conf.j2
index 1ffefb890976d4772a6d86bebcd1e97dd647dd66..57fb02875b250b4096fd4ddd7520babc08780d59 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named40.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named40.conf.j2
@@ -20,10 +20,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "normal.example" {
        type primary;

diff --git a/bin/tests/system/allow_query/ns2/named53.conf.j2 b/bin/tests/system/allow_query/ns2/named53.conf.j2
index 666afedb4c75e2b0cc612f4fa48d76fa59ae4748..5130bb28ec6602cb61d629a209f077b632b6ec6a 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named53.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named53.conf.j2
@@ -7,10 +7,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "normal.example" {
        type primary;

diff --git a/bin/tests/system/allow_query/ns2/named54.conf.j2 b/bin/tests/system/allow_query/ns2/named54.conf.j2
index d8181e95b1ca8c6f5dd7cee58517765a8f458a5f..96dcef0c80dd258a6d6302af1c2f20544defd578 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named54.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named54.conf.j2
@@ -7,10 +7,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "normal.example" {
        type primary;

diff --git a/bin/tests/system/allow_query/ns3/named.conf.j2 b/bin/tests/system/allow_query/ns3/named.conf.j2
index 1aff3cc702214c97bf70d40dc82cdc580fe542ec..4a5e0029be0f25a18072cc5723e0c47b041c39b1 100644 (file)
--- a/bin/tests/system/allow_query/ns3/named.conf.j2
+++ b/bin/tests/system/allow_query/ns3/named.conf.j2
@@ -5,7 +5,4 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}

diff --git a/bin/tests/system/allow_query/ns3/named2.conf.j2 b/bin/tests/system/allow_query/ns3/named2.conf.j2
index 9ee2442873e5cacb549f2c1f2974ed479c7a5f82..f56bb62e85430cc12836f2da515b09e7bfe0b71e 100644 (file)
--- a/bin/tests/system/allow_query/ns3/named2.conf.j2
+++ b/bin/tests/system/allow_query/ns3/named2.conf.j2
@@ -8,7 +8,4 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}

diff --git a/bin/tests/system/allow_query/ns3/named3.conf.j2 b/bin/tests/system/allow_query/ns3/named3.conf.j2
index e9e9a910516a0b6773fcb23b7fb889e7c749cf5e..cc9f2434861ea71df89e4ba997987cbdaf323370 100644 (file)
--- a/bin/tests/system/allow_query/ns3/named3.conf.j2
+++ b/bin/tests/system/allow_query/ns3/named3.conf.j2
@@ -11,7 +11,4 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}

diff --git a/bin/tests/system/allow_query/ns3/named4.conf.j2 b/bin/tests/system/allow_query/ns3/named4.conf.j2
index bafba1339133738ca34eaa9da705829322a42c9c..2771591dac9ae48b2d225c7441b87a054f7dad0c 100644 (file)
--- a/bin/tests/system/allow_query/ns3/named4.conf.j2
+++ b/bin/tests/system/allow_query/ns3/named4.conf.j2
@@ -11,7 +11,4 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}

diff --git a/bin/tests/system/autosign/ns2/named.conf.j2 b/bin/tests/system/autosign/ns2/named.conf.j2
index a09bbcf3d7c1b11f85ce14c22669fa2f8cb719f5..7105cb7410028bc41d2dbbf2ba2c0dc44b4be1d5 100644 (file)
--- a/bin/tests/system/autosign/ns2/named.conf.j2
+++ b/bin/tests/system/autosign/ns2/named.conf.j2
@@ -44,10 +44,7 @@ dnssec-policy "optout" {
        nsec3param iterations 0 optout yes salt-length 0;
 };
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
        type primary;

diff --git a/bin/tests/system/autosign/ns3/named.conf.j2 b/bin/tests/system/autosign/ns3/named.conf.j2
index 06e13e9bf5d54710ec7f3401da57334d49af5178..5af706ae4c06e6ede3924daa522725f1bc260d1b 100644 (file)
--- a/bin/tests/system/autosign/ns3/named.conf.j2
+++ b/bin/tests/system/autosign/ns3/named.conf.j2
@@ -93,10 +93,7 @@ dnssec-policy "rsasha512" {
        };
 };
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
        type secondary;

diff --git a/bin/tests/system/autosign/ns4/named.conf.j2 b/bin/tests/system/autosign/ns4/named.conf.j2
index 53201e9d4a9ea64391aa98a1b5e470f640e1b171..8e5469203fb5b47490e75f7cfd80f7378820d911 100644 (file)
--- a/bin/tests/system/autosign/ns4/named.conf.j2
+++ b/bin/tests/system/autosign/ns4/named.conf.j2
@@ -7,10 +7,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 include "trusted.conf";
 include "private.conf";

diff --git a/bin/tests/system/autosign/ns5/named.conf.j2 b/bin/tests/system/autosign/ns5/named.conf.j2
index a1774fd5a9ee1e3343b0e4028f2adc48ca52ec71..ffcd594a94415cd7eb83abf0c9a113b6caabbe6b 100644 (file)
--- a/bin/tests/system/autosign/ns5/named.conf.j2
+++ b/bin/tests/system/autosign/ns5/named.conf.j2
@@ -7,9 +7,6 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 include "trusted.conf";

diff --git a/bin/tests/system/bailiwick/ns4/named.conf.j2 b/bin/tests/system/bailiwick/ns4/named.conf.j2
index c3b0e86f05feb591cf0e53ee7eb1d8f0ad706ca0..59151ed141e11c2c694cfd1cee8cb8ceb9f90372 100644 (file)
--- a/bin/tests/system/bailiwick/ns4/named.conf.j2
+++ b/bin/tests/system/bailiwick/ns4/named.conf.j2
@@ -6,7 +6,4 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}

diff --git a/bin/tests/system/cacheclean/ns2/named.conf.j2 b/bin/tests/system/cacheclean/ns2/named.conf.j2
index 2e5791bf26b90b16f93b3c96a53741d467f60598..a9aabcca3f8122751d3dc4b1b888df3466f0f9d8 100644 (file)
--- a/bin/tests/system/cacheclean/ns2/named.conf.j2
+++ b/bin/tests/system/cacheclean/ns2/named.conf.j2
@@ -11,10 +11,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "flushtest.example" {
        type forward;

diff --git a/bin/tests/system/cdnxdomain/ns1/named.conf.j2 b/bin/tests/system/cdnxdomain/ns1/named.conf.j2
index ca30edca58e63ba73f0b2bf171df5ba64bd55856..8ba9671eaa667fbaf396f7d51060deb0c6882d60 100644 (file)
--- a/bin/tests/system/cdnxdomain/ns1/named.conf.j2
+++ b/bin/tests/system/cdnxdomain/ns1/named.conf.j2
@@ -11,10 +11,7 @@ options {
 // Trust anchor for "example" (static-ds of NS2's KSK).
 include "trusted.conf";
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 // Resolve "example" only via the signed authoritative server.  The static
 // trust anchor above lets the forwarded answers validate to dns_trust_secure.

diff --git a/bin/tests/system/chain/ns2/named.conf.j2 b/bin/tests/system/chain/ns2/named.conf.j2
index ae49e812734efec654ef21c7e8e46c377d21c6a5..3c1b694c0a23d564d2d9d9d82436544412aaf595 100644 (file)
--- a/bin/tests/system/chain/ns2/named.conf.j2
+++ b/bin/tests/system/chain/ns2/named.conf.j2
@@ -8,10 +8,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone . {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
        type primary;

diff --git a/bin/tests/system/chain/ns5/named.conf.j2 b/bin/tests/system/chain/ns5/named.conf.j2
index dfc7e3efdade791a25df6573b59383d259146118..8f629c7a9d0c6f444c0cba51a638cea15475a6af 100644 (file)
--- a/bin/tests/system/chain/ns5/named.conf.j2
+++ b/bin/tests/system/chain/ns5/named.conf.j2
@@ -8,10 +8,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "sub5.example" {
        type primary;

diff --git a/bin/tests/system/chase_ds/ns3/named.conf.j2 b/bin/tests/system/chase_ds/ns3/named.conf.j2
index e8f5da5ba1aa03f427b4676943303abf281f128f..4fa71acbb4e889d6f709680b4356f79a99992d4a 100644 (file)
--- a/bin/tests/system/chase_ds/ns3/named.conf.j2
+++ b/bin/tests/system/chase_ds/ns3/named.conf.j2
@@ -3,10 +3,7 @@ options {
        dnssec-validation yes;
 };
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 {% include "_common/controls.conf.j2" %}
 

diff --git a/bin/tests/system/checkds/ns2/named.conf.j2 b/bin/tests/system/checkds/ns2/named.conf.j2
index c893b95bec5acdeb2b9cee8833aef808cc1b519d..f80ea59dc79d89aca965a5cb470081c152680860 100644 (file)
--- a/bin/tests/system/checkds/ns2/named.conf.j2
+++ b/bin/tests/system/checkds/ns2/named.conf.j2
@@ -9,10 +9,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "ns2" {
        type primary;

diff --git a/bin/tests/system/checkds/ns3/named.conf.j2 b/bin/tests/system/checkds/ns3/named.conf.j2
index c0d82f5fa44e1352d1c8f8c14eaf9036bcdd6396..25bc78c87376831a207c1b6bb9d3fe83935046b7 100644 (file)
--- a/bin/tests/system/checkds/ns3/named.conf.j2
+++ b/bin/tests/system/checkds/ns3/named.conf.j2
@@ -8,9 +8,6 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 include "trusted.conf";

diff --git a/bin/tests/system/checkds/ns5/named.conf.j2 b/bin/tests/system/checkds/ns5/named.conf.j2
index 9863036100345109d0e306c1ad80440eb4d7bc25..04f9351441710d3240d15119fb359e5708b6adc7 100644 (file)
--- a/bin/tests/system/checkds/ns5/named.conf.j2
+++ b/bin/tests/system/checkds/ns5/named.conf.j2
@@ -9,10 +9,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "ns2" {
        type primary;

diff --git a/bin/tests/system/checkds/ns6/named.conf.j2 b/bin/tests/system/checkds/ns6/named.conf.j2
index b84a62c5d53906666b25bfbfd2320624d306ab1a..036585b256bc65818db518ce882ad08ed11011a4 100644 (file)
--- a/bin/tests/system/checkds/ns6/named.conf.j2
+++ b/bin/tests/system/checkds/ns6/named.conf.j2
@@ -9,10 +9,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "foo" {
        type primary;

diff --git a/bin/tests/system/checkds/ns9/named.conf.j2 b/bin/tests/system/checkds/ns9/named.conf.j2
index 9ff1e7c149ce04d999d4c420448f8f1eb1378f7c..7dfe66b6e63e932ce802fb25cca966dfab7b34e1 100644 (file)
--- a/bin/tests/system/checkds/ns9/named.conf.j2
+++ b/bin/tests/system/checkds/ns9/named.conf.j2
@@ -15,10 +15,7 @@ remote-servers "ns8" port @PORT@ {
        10.53.0.8;
 };
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 /*
  * 1.     Enabling DNSSEC

diff --git a/bin/tests/system/cipher_suites/ns2/named.conf.j2 b/bin/tests/system/cipher_suites/ns2/named.conf.j2
index 2cec45e1330bad1771c1839c5696efbe8d98d2e6..b479b75cf9259bed0e9ee9dfc160774f0f8f401c 100644 (file)
--- a/bin/tests/system/cipher_suites/ns2/named.conf.j2
+++ b/bin/tests/system/cipher_suites/ns2/named.conf.j2
@@ -17,10 +17,7 @@ options {
 };
 
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 tls tls-v1.3 {
        protocols { TLSv1.3; };

diff --git a/bin/tests/system/cipher_suites/ns3/named.conf.j2 b/bin/tests/system/cipher_suites/ns3/named.conf.j2
index cea46eef9be6d5db50755deb164576c18ec03a14..e46a2639ca46c97769b0cfd1ae6f1b0158108af3 100644 (file)
--- a/bin/tests/system/cipher_suites/ns3/named.conf.j2
+++ b/bin/tests/system/cipher_suites/ns3/named.conf.j2
@@ -17,10 +17,7 @@ options {
 };
 
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 tls tls-v1.3 {
        protocols { TLSv1.3; };

diff --git a/bin/tests/system/cipher_suites/ns4/named.conf.j2 b/bin/tests/system/cipher_suites/ns4/named.conf.j2
index bc31a82a556399072e2634701276198079d610a7..343343601b2bf2e359b8642724b318670ca19e81 100644 (file)
--- a/bin/tests/system/cipher_suites/ns4/named.conf.j2
+++ b/bin/tests/system/cipher_suites/ns4/named.conf.j2
@@ -17,10 +17,7 @@ options {
 };
 
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 tls tls-v1.3 {
        protocols { TLSv1.3; };

diff --git a/bin/tests/system/cipher_suites/ns5/named.conf.j2 b/bin/tests/system/cipher_suites/ns5/named.conf.j2
index d798fb1786cfcb2d5db1f835bfa7351b67c98c2d..abc14908603ebcd41a20e182e031c4098fa8239c 100644 (file)
--- a/bin/tests/system/cipher_suites/ns5/named.conf.j2
+++ b/bin/tests/system/cipher_suites/ns5/named.conf.j2
@@ -17,10 +17,7 @@ options {
 };
 
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 tls tls-v1.2 {
        protocols { TLSv1.2; };

diff --git a/bin/tests/system/cyclic_glue/ns4/named.conf.j2 b/bin/tests/system/cyclic_glue/ns4/named.conf.j2
index cb949796d335d7092e973cf94b983575f757f9c3..b5d854701eada6b9504d13674c5b508683fa7bd4 100644 (file)
--- a/bin/tests/system/cyclic_glue/ns4/named.conf.j2
+++ b/bin/tests/system/cyclic_glue/ns4/named.conf.j2
@@ -3,9 +3,6 @@ options {
        dnssec-validation no;
 };
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 {% include "_common/controls.conf.j2" %}

diff --git a/bin/tests/system/digdelv/ns2/named.conf.j2 b/bin/tests/system/digdelv/ns2/named.conf.j2
index a24eeb6986737d939f6c3f844165b775c70ecf95..6ca58fd78e5a550b63087593f25b2441bdeee31f 100644 (file)
--- a/bin/tests/system/digdelv/ns2/named.conf.j2
+++ b/bin/tests/system/digdelv/ns2/named.conf.j2
@@ -9,10 +9,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
        type primary;

diff --git a/bin/tests/system/digdelv/ns3/named.conf.j2 b/bin/tests/system/digdelv/ns3/named.conf.j2
index b965d96e34f5e1c12c98ef74d77c9268ac3643d1..fdb705c79bd4c2284984d784f87f9d85b22c8a7d 100644 (file)
--- a/bin/tests/system/digdelv/ns3/named.conf.j2
+++ b/bin/tests/system/digdelv/ns3/named.conf.j2
@@ -7,7 +7,4 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}

diff --git a/bin/tests/system/dispatch/ns2/named.conf.j2 b/bin/tests/system/dispatch/ns2/named.conf.j2
index 29a90f62e82a6ed01a9a6fffd42da38eb1bd6763..b496e29c0dc642c4c2680462e1bdda49ffc391d6 100644 (file)
--- a/bin/tests/system/dispatch/ns2/named.conf.j2
+++ b/bin/tests/system/dispatch/ns2/named.conf.j2
@@ -9,10 +9,7 @@ options {
        dnssec-validation no;
 };
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
        type primary;

diff --git a/bin/tests/system/dns64/ns2/named.conf.j2 b/bin/tests/system/dns64/ns2/named.conf.j2
index 54fe2e8fa1c84c8eef0b48a5744d199580e5255d..d8c3a4a76e6fdcbc7044c076cffee0f83df58e49 100644 (file)
--- a/bin/tests/system/dns64/ns2/named.conf.j2
+++ b/bin/tests/system/dns64/ns2/named.conf.j2
@@ -41,10 +41,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "rpz" {
        type primary;

diff --git a/bin/tests/system/dnssec/ns2/named.conf.j2 b/bin/tests/system/dnssec/ns2/named.conf.j2
index 8d7a1bafea5c0d6ceb1b8d3ab229b7e17d615939..70a4a0471629cfee82dee888e2e2503e658eaf4c 100644 (file)
--- a/bin/tests/system/dnssec/ns2/named.conf.j2
+++ b/bin/tests/system/dnssec/ns2/named.conf.j2
@@ -41,10 +41,7 @@ dnssec-policy "not-enough-hours-in-day" {
        signatures-validity 500d;
 };
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "trusted" {
        type primary;

diff --git a/bin/tests/system/dnssec/ns3/named.conf.j2 b/bin/tests/system/dnssec/ns3/named.conf.j2
index 2fe1c4bac2e5d871e199afa47650b5baef500ef6..126856fd4ac9a97bc7e4a2b40c7fc45b969c95d7 100644 (file)
--- a/bin/tests/system/dnssec/ns3/named.conf.j2
+++ b/bin/tests/system/dnssec/ns3/named.conf.j2
@@ -50,10 +50,7 @@ dnssec-policy "autonsec3" {
        nsec3param iterations 0 optout no salt-length 0;
 };
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
        type secondary;

diff --git a/bin/tests/system/dnssec/ns6/named.conf.j2 b/bin/tests/system/dnssec/ns6/named.conf.j2
index 9f5ecbb4b489814737611c2c0038ebe2cc730833..49e27d3e7fc85e388a45d32fd32ae258d9517a9d 100644 (file)
--- a/bin/tests/system/dnssec/ns6/named.conf.j2
+++ b/bin/tests/system/dnssec/ns6/named.conf.j2
@@ -9,10 +9,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "optout-tld" {
        type primary;

diff --git a/bin/tests/system/dnssec_bypass/ns4/named.conf.j2 b/bin/tests/system/dnssec_bypass/ns4/named.conf.j2
index 385e6a5f61446d8e6426cb882e3621be5b838c4d..4155769a06016203847d87fba696c7d2dee6ffac 100644 (file)
--- a/bin/tests/system/dnssec_bypass/ns4/named.conf.j2
+++ b/bin/tests/system/dnssec_bypass/ns4/named.conf.j2
@@ -24,7 +24,4 @@ trust-anchors {
        @root.domain@ @root.type@ @root.contents@;
 };
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}

diff --git a/bin/tests/system/dnssec_nsec3/ns2/named.conf.j2 b/bin/tests/system/dnssec_nsec3/ns2/named.conf.j2
index 88d3c7fc94663f92d62d34e7d9e75180d3d01658..66b07753fadd34b94467e34f236def3420db1791 100644 (file)
--- a/bin/tests/system/dnssec_nsec3/ns2/named.conf.j2
+++ b/bin/tests/system/dnssec_nsec3/ns2/named.conf.j2
@@ -9,10 +9,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "f025.test" {
        type static-stub;

diff --git a/bin/tests/system/dnssec_parent_rrsig/ns2/named.conf.j2 b/bin/tests/system/dnssec_parent_rrsig/ns2/named.conf.j2
index b23c4296f14bc5598977d8f09545785d0103c74b..c85187080d4f6976a358eb60d3ab589de2d1caf8 100644 (file)
--- a/bin/tests/system/dnssec_parent_rrsig/ns2/named.conf.j2
+++ b/bin/tests/system/dnssec_parent_rrsig/ns2/named.conf.j2
@@ -11,10 +11,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "f044.test" {
        type static-stub;

diff --git a/bin/tests/system/dnssec_wildcard/ns2/named.conf.j2 b/bin/tests/system/dnssec_wildcard/ns2/named.conf.j2
index 78760e5b427412a3d7f90d416040f1df4459aeb5..811dd8a234760b423d5d63aa21dcf13b457f972b 100644 (file)
--- a/bin/tests/system/dnssec_wildcard/ns2/named.conf.j2
+++ b/bin/tests/system/dnssec_wildcard/ns2/named.conf.j2
@@ -8,10 +8,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 
 {% if PARENT_DNSKEY is defined and PARENT_DNSKEY|length %}

diff --git a/bin/tests/system/dnstap/ns2/named.conf.j2 b/bin/tests/system/dnstap/ns2/named.conf.j2
index d4f9c160bec6a1c07451c48be9484a72e76faf6a..3a685f9c1388ba0641c1c725b7a71ae3c323ad41 100644 (file)
--- a/bin/tests/system/dnstap/ns2/named.conf.j2
+++ b/bin/tests/system/dnstap/ns2/named.conf.j2
@@ -14,10 +14,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
        type primary;

diff --git a/bin/tests/system/dnstap/ns3/named.conf.j2 b/bin/tests/system/dnstap/ns3/named.conf.j2
index ffd76d231e78e12051366d66a95c1956e73acab7..67bf4b5f0ae25203ac5f3577a7a24fe06dc58605 100644 (file)
--- a/bin/tests/system/dnstap/ns3/named.conf.j2
+++ b/bin/tests/system/dnstap/ns3/named.conf.j2
@@ -16,7 +16,4 @@ server 10.53.0.1 { tcp-only yes; };
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}

diff --git a/bin/tests/system/dnstap/ns4/named.conf.j2 b/bin/tests/system/dnstap/ns4/named.conf.j2
index 1ad087cc59c8ac2f2a710be92603c5b97e1fd2de..72e78160dc59ef53154f3060ce97227eb518c98b 100644 (file)
--- a/bin/tests/system/dnstap/ns4/named.conf.j2
+++ b/bin/tests/system/dnstap/ns4/named.conf.j2
@@ -15,7 +15,4 @@ server 10.53.0.1 { tcp-only yes; };
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}

diff --git a/bin/tests/system/doth/ns2/named.conf.j2 b/bin/tests/system/doth/ns2/named.conf.j2
index f074665dda6de1c683a77104daae34d6af323499..d18f818500f9e8411396c442cc15274531dba01b 100644 (file)
--- a/bin/tests/system/doth/ns2/named.conf.j2
+++ b/bin/tests/system/doth/ns2/named.conf.j2
@@ -34,10 +34,7 @@ options {
 };
 
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 tls tls-example-primary-wrong-ca {
        remote-hostname "srv01.crt01.example.com"; // enable Strict TLS

diff --git a/bin/tests/system/doth/ns3/named.conf.j2 b/bin/tests/system/doth/ns3/named.conf.j2
index c1dc279363e633fbc309e62d8529d4ab9332418e..93f1a19230260ee72f12228c043b5f922469f125 100644 (file)
--- a/bin/tests/system/doth/ns3/named.conf.j2
+++ b/bin/tests/system/doth/ns3/named.conf.j2
@@ -25,10 +25,7 @@ options {
 };
 
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 tls tls-v1.2-pfs {
        protocols { TLSv1.2; };

diff --git a/bin/tests/system/doth/ns4/named.conf.j2 b/bin/tests/system/doth/ns4/named.conf.j2
index b1b5d456321e61fb57ba7f233e6c00f7d92fab24..72cad042ea6f711dc3db64aa1681ca8363daa15c 100644 (file)
--- a/bin/tests/system/doth/ns4/named.conf.j2
+++ b/bin/tests/system/doth/ns4/named.conf.j2
@@ -33,10 +33,7 @@ options {
 };
 
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 tls tls-v1.2-pfs {
        protocols { TLSv1.2; };

diff --git a/bin/tests/system/doth/ns5/named.conf.j2 b/bin/tests/system/doth/ns5/named.conf.j2
index d7a094e711a410f7c75b3675f7b39a8c75d1bfec..bc8b302d6d09bd1ccc00d9e2de04b3d59e53a947 100644 (file)
--- a/bin/tests/system/doth/ns5/named.conf.j2
+++ b/bin/tests/system/doth/ns5/named.conf.j2
@@ -21,10 +21,7 @@ options {
 };
 
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 # Let's reuse the same entry multiple times to see if transfers will succeed
 

diff --git a/bin/tests/system/dsdigest/ns2/named.conf.j2 b/bin/tests/system/dsdigest/ns2/named.conf.j2
index 783d651a8f717020b98549d158ed4f5266c01a2f..db109b7718a73ae3c174cf454a793863c7367435 100644 (file)
--- a/bin/tests/system/dsdigest/ns2/named.conf.j2
+++ b/bin/tests/system/dsdigest/ns2/named.conf.j2
@@ -8,10 +8,7 @@ options {
        dnssec-validation yes;
 };
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "good" {
        type primary;

diff --git a/bin/tests/system/dsdigest/ns3/named.conf.j2 b/bin/tests/system/dsdigest/ns3/named.conf.j2
index 6c403bb431a0ce8948f3836fd1ea4c7f2e84adb9..ead15cd8c35e7e1ec994eac8585e5a78ae2490da 100644 (file)
--- a/bin/tests/system/dsdigest/ns3/named.conf.j2
+++ b/bin/tests/system/dsdigest/ns3/named.conf.j2
@@ -10,9 +10,6 @@ options {
 
 };
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 include "trusted.conf";

diff --git a/bin/tests/system/dsdigest/ns4/named.conf.j2 b/bin/tests/system/dsdigest/ns4/named.conf.j2
index ba8ca55dad41ee7206070db67920cfa6c382936c..ce3567d17f7821056124e915013bdb37f4494249 100644 (file)
--- a/bin/tests/system/dsdigest/ns4/named.conf.j2
+++ b/bin/tests/system/dsdigest/ns4/named.conf.j2
@@ -9,9 +9,6 @@ options {
        disable-ds-digests . { SHA-1; SHA-384; 5; 6; 7; 8; 9; };
 };
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 include "trusted.conf";

diff --git a/bin/tests/system/ecdsa/ns2/named.conf.j2 b/bin/tests/system/ecdsa/ns2/named.conf.j2
index 8bc2a669ea51a2a00f1dcb5ac4f67210f78243ed..901996884ee58d69abe1117aabff44aff855e3e8 100644 (file)
--- a/bin/tests/system/ecdsa/ns2/named.conf.j2
+++ b/bin/tests/system/ecdsa/ns2/named.conf.j2
@@ -7,9 +7,6 @@ options {
        dnssec-validation yes;
 };
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 include "trusted.conf";

diff --git a/bin/tests/system/ecdsa/ns3/named.conf.j2 b/bin/tests/system/ecdsa/ns3/named.conf.j2
index 8bc2a669ea51a2a00f1dcb5ac4f67210f78243ed..901996884ee58d69abe1117aabff44aff855e3e8 100644 (file)
--- a/bin/tests/system/ecdsa/ns3/named.conf.j2
+++ b/bin/tests/system/ecdsa/ns3/named.conf.j2
@@ -7,9 +7,6 @@ options {
        dnssec-validation yes;
 };
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 include "trusted.conf";

diff --git a/bin/tests/system/eddsa/ns2/named.conf.j2 b/bin/tests/system/eddsa/ns2/named.conf.j2
index 8bc2a669ea51a2a00f1dcb5ac4f67210f78243ed..901996884ee58d69abe1117aabff44aff855e3e8 100644 (file)
--- a/bin/tests/system/eddsa/ns2/named.conf.j2
+++ b/bin/tests/system/eddsa/ns2/named.conf.j2
@@ -7,9 +7,6 @@ options {
        dnssec-validation yes;
 };
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 include "trusted.conf";

diff --git a/bin/tests/system/eddsa/ns3/named.conf.j2 b/bin/tests/system/eddsa/ns3/named.conf.j2
index 8bc2a669ea51a2a00f1dcb5ac4f67210f78243ed..901996884ee58d69abe1117aabff44aff855e3e8 100644 (file)
--- a/bin/tests/system/eddsa/ns3/named.conf.j2
+++ b/bin/tests/system/eddsa/ns3/named.conf.j2
@@ -7,9 +7,6 @@ options {
        dnssec-validation yes;
 };
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 include "trusted.conf";

diff --git a/bin/tests/system/fwdfirst/ns4/named.conf.j2 b/bin/tests/system/fwdfirst/ns4/named.conf.j2
index 59881ddbd60aa44b490e416e0a929767521c9118..66ca243f0e0c24314a8b8ee7ec7c417be89e36da 100644 (file)
--- a/bin/tests/system/fwdfirst/ns4/named.conf.j2
+++ b/bin/tests/system/fwdfirst/ns4/named.conf.j2
@@ -8,10 +8,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "fwd.hack" {
        type forward;

diff --git a/bin/tests/system/fwdfirst/ns5/named.conf.j2 b/bin/tests/system/fwdfirst/ns5/named.conf.j2
index 4b7f2689c1601bc7c1e614ebf0c4bf1e600b7e76..fa5cb9f98e94a33cdbdc3a98337efb25b53b776b 100644 (file)
--- a/bin/tests/system/fwdfirst/ns5/named.conf.j2
+++ b/bin/tests/system/fwdfirst/ns5/named.conf.j2
@@ -10,7 +10,4 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}

diff --git a/bin/tests/system/inline/ns6/named.conf.j2 b/bin/tests/system/inline/ns6/named.conf.j2
index 18bfaac55ed9e047c4eb4dc6e1c4cf183cc06c94..1af644d501f8e3cd8944b6a6bd86c9897e322869 100644 (file)
--- a/bin/tests/system/inline/ns6/named.conf.j2
+++ b/bin/tests/system/inline/ns6/named.conf.j2
@@ -8,9 +8,6 @@ options {
        dnssec-validation yes;
 };
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 include "trusted.conf";

diff --git a/bin/tests/system/integrity/ns1/named.conf.j2 b/bin/tests/system/integrity/ns1/named.conf.j2
index f55bb75d543f7e925015254f661034597488f78f..4320619389096a1147bb95f3bcefbf95f40a6dd1 100644 (file)
--- a/bin/tests/system/integrity/ns1/named.conf.j2
+++ b/bin/tests/system/integrity/ns1/named.conf.j2
@@ -8,10 +8,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "mx-cname-fail" {
        type primary;

diff --git a/bin/tests/system/keepalive/ns2/named.conf.j2 b/bin/tests/system/keepalive/ns2/named.conf.j2
index e4e9efd42e3b0839c197a8b94e59c929c28ca28e..ce201c73a8d1a053d8662ab9c92406bd1dfb21c9 100644 (file)
--- a/bin/tests/system/keepalive/ns2/named.conf.j2
+++ b/bin/tests/system/keepalive/ns2/named.conf.j2
@@ -7,10 +7,7 @@ options {
        dnssec-validation no;
 };
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
        type primary;

diff --git a/bin/tests/system/keepalive/ns3/named.conf.j2 b/bin/tests/system/keepalive/ns3/named.conf.j2
index a9bbe5c9133349ab27b59b28e21fa50fa9585236..72acf0d2476c1731a127d05655dd38b738f908b9 100644 (file)
--- a/bin/tests/system/keepalive/ns3/named.conf.j2
+++ b/bin/tests/system/keepalive/ns3/named.conf.j2
@@ -10,7 +10,4 @@ server 10.53.0.2 {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}

diff --git a/bin/tests/system/masterfile/ns2/named.conf.j2 b/bin/tests/system/masterfile/ns2/named.conf.j2
index e556e97d5860d6f165e2dee7be23866f08b8d79b..4034698ac633bd498d9ed391bee365260dd8ec57 100644 (file)
--- a/bin/tests/system/masterfile/ns2/named.conf.j2
+++ b/bin/tests/system/masterfile/ns2/named.conf.j2
@@ -9,10 +9,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 template primary {
        type primary;

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

diff --git a/bin/tests/system/minimalresponses/ns4/named.conf.j2 b/bin/tests/system/minimalresponses/ns4/named.conf.j2
index 2ebff3c1ce948bb7859ddb065fc5a6f1e1d6ac44..019d194d98255bef71d0f595b82579bbc9c303ac 100644 (file)
--- a/bin/tests/system/minimalresponses/ns4/named.conf.j2
+++ b/bin/tests/system/minimalresponses/ns4/named.conf.j2
@@ -8,10 +8,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example4" {
        type primary;

diff --git a/bin/tests/system/mirror/ns3/named.conf.j2 b/bin/tests/system/mirror/ns3/named.conf.j2
index 693ba93f4f87c1151c0ca0c3676f384132032e0f..d1b9dca07a7d79609512683a47c33a109dcb163e 100644 (file)
--- a/bin/tests/system/mirror/ns3/named.conf.j2
+++ b/bin/tests/system/mirror/ns3/named.conf.j2
@@ -8,10 +8,7 @@ options {
        dnssec-validation yes;
 };
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "." {
        type mirror;

diff --git a/bin/tests/system/mkeys/ns2/named.conf.j2 b/bin/tests/system/mkeys/ns2/named.conf.j2
index d16a02c327c175b9262e9f52fcfddc6d6a74c481..9884d10baee8020c6f697eb49fd8b7cfb2023a2e 100644 (file)
--- a/bin/tests/system/mkeys/ns2/named.conf.j2
+++ b/bin/tests/system/mkeys/ns2/named.conf.j2
@@ -9,7 +9,4 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}

diff --git a/bin/tests/system/mkeys/ns3/named.conf.j2 b/bin/tests/system/mkeys/ns3/named.conf.j2
index 970878a1403cfd15c8265c048381644181c88cc4..065be8f9a292020400b9734ba443a77f62ec7053 100644 (file)
--- a/bin/tests/system/mkeys/ns3/named.conf.j2
+++ b/bin/tests/system/mkeys/ns3/named.conf.j2
@@ -9,9 +9,6 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 include "broken.conf";

diff --git a/bin/tests/system/mkeys/ns4/named.conf.j2 b/bin/tests/system/mkeys/ns4/named.conf.j2
index 1b28bc3243b99142e880371364cbcd83476944b2..d1a71c1920a1750990ae053e461e994a0f5c3717 100644 (file)
--- a/bin/tests/system/mkeys/ns4/named.conf.j2
+++ b/bin/tests/system/mkeys/ns4/named.conf.j2
@@ -9,10 +9,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "sub.foo" {
        type primary;

diff --git a/bin/tests/system/mkeys/ns5/named.conf.j2 b/bin/tests/system/mkeys/ns5/named.conf.j2
index 89a40a5279b97c552844450af85fecbc8163ae84..f40878e74d667d9a305d4de7185c77318d3446e6 100644 (file)
--- a/bin/tests/system/mkeys/ns5/named.conf.j2
+++ b/bin/tests/system/mkeys/ns5/named.conf.j2
@@ -9,10 +9,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "foo" {
        type primary;

diff --git a/bin/tests/system/mkeys/ns6/named.conf.j2 b/bin/tests/system/mkeys/ns6/named.conf.j2
index a8da3412af81730d559526d82d4a745b0207f097..58613224e7807f7c7e7aa9ca8034598973542959 100644 (file)
--- a/bin/tests/system/mkeys/ns6/named.conf.j2
+++ b/bin/tests/system/mkeys/ns6/named.conf.j2
@@ -9,9 +9,6 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 include "managed.conf";

diff --git a/bin/tests/system/multisigner/ns2/named.conf.j2 b/bin/tests/system/multisigner/ns2/named.conf.j2
index 42a649d586b0769db9b44c08882fd05592f3dedb..edbfe0c19ce90f9952f61a9415a679878b29fb3e 100644 (file)
--- a/bin/tests/system/multisigner/ns2/named.conf.j2
+++ b/bin/tests/system/multisigner/ns2/named.conf.j2
@@ -29,9 +29,6 @@ zone "secondary" {
        file "secondary.db.signed";
 };
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 include "trusted.conf";

diff --git a/bin/tests/system/multisigner/ns3/named.conf.j2 b/bin/tests/system/multisigner/ns3/named.conf.j2
index 05553bfd8db87d5ceec87c825963b1caeab5aaf5..0007f12d3a215b4dc5d3498470cb9e33ee9ec84a 100644 (file)
--- a/bin/tests/system/multisigner/ns3/named.conf.j2
+++ b/bin/tests/system/multisigner/ns3/named.conf.j2
@@ -45,9 +45,6 @@ zone "model2.secondary." {
        notify no;
 };
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 include "trusted.conf";

diff --git a/bin/tests/system/multisigner/ns4/named.conf.j2 b/bin/tests/system/multisigner/ns4/named.conf.j2
index d949a39096611a3aaa3a79cdedc9744b086e9a46..9a37802af67b8954b5c5fdfd96177e957c446738 100644 (file)
--- a/bin/tests/system/multisigner/ns4/named.conf.j2
+++ b/bin/tests/system/multisigner/ns4/named.conf.j2
@@ -45,9 +45,6 @@ zone "model2.secondary." {
        notify no;
 };
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 include "trusted.conf";

diff --git a/bin/tests/system/multisigner/ns5/named.conf.j2 b/bin/tests/system/multisigner/ns5/named.conf.j2
index 0774490484b2480b19f661986280d29f9c36336c..565d5f0f0dd9eb99335e9e50987dae36a3d524b7 100644 (file)
--- a/bin/tests/system/multisigner/ns5/named.conf.j2
+++ b/bin/tests/system/multisigner/ns5/named.conf.j2
@@ -18,9 +18,6 @@ zone "model2.secondary." {
        file "model2.secondary.db";
 };
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 include "trusted.conf";

diff --git a/bin/tests/system/notify/ns2/named.conf.j2 b/bin/tests/system/notify/ns2/named.conf.j2
index 994d9b2fb3870ceadef006fe85cfe095cf55a1f0..28835ed95d0d4cb5764b38c48574ffdb459017c0 100644 (file)
--- a/bin/tests/system/notify/ns2/named.conf.j2
+++ b/bin/tests/system/notify/ns2/named.conf.j2
@@ -22,10 +22,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
        type primary;

diff --git a/bin/tests/system/notify/ns3/named.conf.j2 b/bin/tests/system/notify/ns3/named.conf.j2
index 931f6d6e1ebb2901519755e83830332784a93def..7704e467512a48834ba540fed1bba5436cd3c79a 100644 (file)
--- a/bin/tests/system/notify/ns3/named.conf.j2
+++ b/bin/tests/system/notify/ns3/named.conf.j2
@@ -16,10 +16,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
        type secondary;

diff --git a/bin/tests/system/notify/ns4/named.conf.j2 b/bin/tests/system/notify/ns4/named.conf.j2
index ea332d1906ce7144f7bb99d9f481e7412cb14a69..3912e6bba4ef2fd2c987eec5e45e64d09ce76ff1 100644 (file)
--- a/bin/tests/system/notify/ns4/named.conf.j2
+++ b/bin/tests/system/notify/ns4/named.conf.j2
@@ -9,10 +9,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "x21" {
        type secondary;

diff --git a/bin/tests/system/nsec/ns3/named.conf.j2 b/bin/tests/system/nsec/ns3/named.conf.j2
index 5e7c3ecd98241310906d071f1d62c25055a5bf24..b254b4faa42b233221ce422d116ad719e83adb8c 100644 (file)
--- a/bin/tests/system/nsec/ns3/named.conf.j2
+++ b/bin/tests/system/nsec/ns3/named.conf.j2
@@ -9,9 +9,6 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-        type hint;
-        file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 include "trusted.conf";

diff --git a/bin/tests/system/nsec3_impersonation/ns2/named.conf.j2 b/bin/tests/system/nsec3_impersonation/ns2/named.conf.j2
index 7193ba0e48b0c9f5353de0108f7857207000e144..826e91420d0a03c2dcce8d66f7fc447e4041058d 100644 (file)
--- a/bin/tests/system/nsec3_impersonation/ns2/named.conf.j2
+++ b/bin/tests/system/nsec3_impersonation/ns2/named.conf.j2
@@ -7,10 +7,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "tld.test" {
        type static-stub;

diff --git a/bin/tests/system/nsec_grandparent/ns2/named.conf.j2 b/bin/tests/system/nsec_grandparent/ns2/named.conf.j2
index 9a34387e7773fe09e9c4da9b178758dc955a338d..db2245a50ac0fbd9c11bd1d040e1c6f325490e33 100644 (file)
--- a/bin/tests/system/nsec_grandparent/ns2/named.conf.j2
+++ b/bin/tests/system/nsec_grandparent/ns2/named.conf.j2
@@ -8,10 +8,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "p031.test" {
        type static-stub;

diff --git a/bin/tests/system/nsec_piggyback/ns3/named.conf.j2 b/bin/tests/system/nsec_piggyback/ns3/named.conf.j2
index 8e79c395f080f564a83dca14012fdbd3636c2f22..610eccce718d2b631d44806527693d0bf636885f 100644 (file)
--- a/bin/tests/system/nsec_piggyback/ns3/named.conf.j2
+++ b/bin/tests/system/nsec_piggyback/ns3/named.conf.j2
@@ -8,10 +8,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "p22.hack" {
        type static-stub;

diff --git a/bin/tests/system/nsec_synthesis/ns2/named.conf.j2 b/bin/tests/system/nsec_synthesis/ns2/named.conf.j2
index 8b6e1bad2ee4a6683c147e6dd99e4b2abd240db8..820c17f4def1f6ad85c261f6c34fd018d9a0373f 100644 (file)
--- a/bin/tests/system/nsec_synthesis/ns2/named.conf.j2
+++ b/bin/tests/system/nsec_synthesis/ns2/named.conf.j2
@@ -8,10 +8,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "f004.test" {
        type static-stub;

diff --git a/bin/tests/system/nsec_synthesis/ns3/named.conf.j2 b/bin/tests/system/nsec_synthesis/ns3/named.conf.j2
index 75c7de27ecf9e33f945bcd6d8717ca171d0c0731..fcf00e88558926c72a15d95a807c5271e01c5d23 100644 (file)
--- a/bin/tests/system/nsec_synthesis/ns3/named.conf.j2
+++ b/bin/tests/system/nsec_synthesis/ns3/named.conf.j2
@@ -7,10 +7,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "f007.test" {
        type primary;

diff --git a/bin/tests/system/nta/ns4/named.conf.j2 b/bin/tests/system/nta/ns4/named.conf.j2
index 98321e1c0d0fbf4517bb4802ebf2e177489ad2d6..e3565fb9a6253bd6c06620dd1bb3f3a0cf3721f3 100644 (file)
--- a/bin/tests/system/nta/ns4/named.conf.j2
+++ b/bin/tests/system/nta/ns4/named.conf.j2
@@ -15,10 +15,7 @@ include "trusted.conf";
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "corp" {
        type static-stub;

diff --git a/bin/tests/system/padding/ns2/named.conf.j2 b/bin/tests/system/padding/ns2/named.conf.j2
index 9ebf12d913f595301127bba2e7282110af92214d..046cce77bc663665c36ec49ef80eb0d1fe4e0b30 100644 (file)
--- a/bin/tests/system/padding/ns2/named.conf.j2
+++ b/bin/tests/system/padding/ns2/named.conf.j2
@@ -7,10 +7,7 @@ options {
        dnssec-validation no;
 };
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
        type primary;

diff --git a/bin/tests/system/padding/ns3/named.conf.j2 b/bin/tests/system/padding/ns3/named.conf.j2
index 7ee3f0183e0202bb02de68a89251283772ae9ab7..a4e6cf85f4a22e77a49c38e0139da360269f9e0b 100644 (file)
--- a/bin/tests/system/padding/ns3/named.conf.j2
+++ b/bin/tests/system/padding/ns3/named.conf.j2
@@ -10,7 +10,4 @@ server 10.53.0.2 {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}

diff --git a/bin/tests/system/padding/ns4/named.conf.j2 b/bin/tests/system/padding/ns4/named.conf.j2
index 3b94e5ff43276175b921a8ec4e231747f44f0199..70e4706623e248780ba0b7c5bd9891f71b639254 100644 (file)
--- a/bin/tests/system/padding/ns4/named.conf.j2
+++ b/bin/tests/system/padding/ns4/named.conf.j2
@@ -10,7 +10,4 @@ server 10.53.0.2 {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}

diff --git a/bin/tests/system/pending/ns2/named.conf.j2 b/bin/tests/system/pending/ns2/named.conf.j2
index 78cf1ae21c64dbded63d84635f326b5be7dc8705..9fee707064310e55b87c8e22f5086bbfd47e50b1 100644 (file)
--- a/bin/tests/system/pending/ns2/named.conf.j2
+++ b/bin/tests/system/pending/ns2/named.conf.j2
@@ -10,10 +10,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
        type primary;

diff --git a/bin/tests/system/pending/ns3/named.conf.j2 b/bin/tests/system/pending/ns3/named.conf.j2
index 34a912d5e14a87892211dc2a7f90918bff14a1fb..437ef1e9bac785f576b3e013e065dbc3548e8adb 100644 (file)
--- a/bin/tests/system/pending/ns3/named.conf.j2
+++ b/bin/tests/system/pending/ns3/named.conf.j2
@@ -11,10 +11,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "mail.example" {
        type primary;

diff --git a/bin/tests/system/pending/ns4/named.conf.j2 b/bin/tests/system/pending/ns4/named.conf.j2
index 3a3d770f99af89ea87ea59b5568168295d18d657..f10bfabe5125657ed7ea99ab526cff6671ee40c5 100644 (file)
--- a/bin/tests/system/pending/ns4/named.conf.j2
+++ b/bin/tests/system/pending/ns4/named.conf.j2
@@ -7,7 +7,4 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}

diff --git a/bin/tests/system/pipelined/ns2/named.conf.j2 b/bin/tests/system/pipelined/ns2/named.conf.j2
index c5cf78303f44798154d4cf8616de4eb5e498ec8b..949f8e03affebd1c51147775062cfc4ccf041132 100644 (file)
--- a/bin/tests/system/pipelined/ns2/named.conf.j2
+++ b/bin/tests/system/pipelined/ns2/named.conf.j2
@@ -6,10 +6,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "examplea" {
        type primary;

diff --git a/bin/tests/system/pipelined/ns3/named.conf.j2 b/bin/tests/system/pipelined/ns3/named.conf.j2
index 92fea51cea9446a0a0612c29166ff34a8a5e9ba2..ca52d0eec580c4443e395f30c92d52f842d2c28b 100644 (file)
--- a/bin/tests/system/pipelined/ns3/named.conf.j2
+++ b/bin/tests/system/pipelined/ns3/named.conf.j2
@@ -6,10 +6,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "exampleb" {
        type primary;

diff --git a/bin/tests/system/pipelined/ns4/named.conf.j2 b/bin/tests/system/pipelined/ns4/named.conf.j2
index 74a532e9d325f0e0cbac31faa088ac56c051f66a..b5aee432d26d157bc8254794c4e5be8103ac9180 100644 (file)
--- a/bin/tests/system/pipelined/ns4/named.conf.j2
+++ b/bin/tests/system/pipelined/ns4/named.conf.j2
@@ -6,7 +6,4 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}

diff --git a/bin/tests/system/qmin/ns5/named.conf.j2 b/bin/tests/system/qmin/ns5/named.conf.j2
index 3a1ba825b3a12afbfa83c484cc674ad6ee9da763..070c64bc313f26862aee972224eee4cce55acf59 100644 (file)
--- a/bin/tests/system/qmin/ns5/named.conf.j2
+++ b/bin/tests/system/qmin/ns5/named.conf.j2
@@ -16,10 +16,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "in-addr.arpa" {
        type primary;

diff --git a/bin/tests/system/qmin/ns6/named.conf.j2 b/bin/tests/system/qmin/ns6/named.conf.j2
index 35052b289e5d30861fa6495fdf299066823197d1..091e4982808dd1c761ad9f36eae0fed3a01c9a85 100644 (file)
--- a/bin/tests/system/qmin/ns6/named.conf.j2
+++ b/bin/tests/system/qmin/ns6/named.conf.j2
@@ -10,7 +10,4 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}

diff --git a/bin/tests/system/qmin/ns7/named.conf.j2 b/bin/tests/system/qmin/ns7/named.conf.j2
index 765a4e3801c8a293756dcff8ab910f9682b82ffe..4cbd3a00eacf231c02420a4d9fb5a9ff201ccc28 100644 (file)
--- a/bin/tests/system/qmin/ns7/named.conf.j2
+++ b/bin/tests/system/qmin/ns7/named.conf.j2
@@ -11,10 +11,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "fwd." IN {
        type forward;

diff --git a/bin/tests/system/randomizens/ns6/named.conf.j2 b/bin/tests/system/randomizens/ns6/named.conf.j2
index d74ec52867b6f755b3004afa251f73d31b4a5a08..5e3c4cb1f72b43eece6158ca422de69b61d53bf4 100644 (file)
--- a/bin/tests/system/randomizens/ns6/named.conf.j2
+++ b/bin/tests/system/randomizens/ns6/named.conf.j2
@@ -6,7 +6,4 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}

diff --git a/bin/tests/system/redirect/ns2/named.conf.j2 b/bin/tests/system/redirect/ns2/named.conf.j2
index fc8b394c4c5a079fa3520d1f7211a9af41d82b78..76a97e216961caa129291610fa73914ae28a8059 100644 (file)
--- a/bin/tests/system/redirect/ns2/named.conf.j2
+++ b/bin/tests/system/redirect/ns2/named.conf.j2
@@ -11,10 +11,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "." {
        type redirect;

diff --git a/bin/tests/system/rndc/ns2/named.conf.j2 b/bin/tests/system/rndc/ns2/named.conf.j2
index 0c467e63d01bddafbf1eaf61129949dd8b9b4bf6..a7a273b1f64d8583f76d26d1735d63cb542e50a9 100644 (file)
--- a/bin/tests/system/rndc/ns2/named.conf.j2
+++ b/bin/tests/system/rndc/ns2/named.conf.j2
@@ -21,10 +21,7 @@ controls {
 };
 
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "nil" {
        type primary;

diff --git a/bin/tests/system/rndc/ns5/named.conf.j2 b/bin/tests/system/rndc/ns5/named.conf.j2
index 435453eec40cab10a14551209a75f153b2b09a9b..af36a4ec849ff19f4b3b2774527708b5cdb40135 100644 (file)
--- a/bin/tests/system/rndc/ns5/named.conf.j2
+++ b/bin/tests/system/rndc/ns5/named.conf.j2
@@ -14,7 +14,4 @@ controls {
        inet 10.53.0.5 port @CONTROLPORT@ allow { any; } keys { rndc_key; } read-only yes;
 };
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}

diff --git a/bin/tests/system/rollover/ns2/named.conf.j2 b/bin/tests/system/rollover/ns2/named.conf.j2
index 45d16d1f3661a1c778c1ebc59c2017e1f1fce12e..b26d6150f24e55116ecc7cb66a4c356e1d0b6934 100644 (file)
--- a/bin/tests/system/rollover/ns2/named.conf.j2
+++ b/bin/tests/system/rollover/ns2/named.conf.j2
@@ -10,10 +10,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 {% for zone in tlds %}
 zone "@zone@" {

diff --git a/bin/tests/system/rollover/ns3/named.common.conf.j2 b/bin/tests/system/rollover/ns3/named.common.conf.j2
index f94c07d81adb440305ef97b4a8d59ad2d406680d..90c690a49d9958d4caa6ba88d8f57ae91aa1c167 100644 (file)
--- a/bin/tests/system/rollover/ns3/named.common.conf.j2
+++ b/bin/tests/system/rollover/ns3/named.common.conf.j2
@@ -15,7 +15,4 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-        type hint;
-        file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}

diff --git a/bin/tests/system/rrsetorder/ns3/named.conf.j2 b/bin/tests/system/rrsetorder/ns3/named.conf.j2
index e1053301918ee154b995cc4aca2a0d7ae8ab0248..f2f36b3e68c519bf87f94e0ffa48583b9bf9adc4 100644 (file)
--- a/bin/tests/system/rrsetorder/ns3/named.conf.j2
+++ b/bin/tests/system/rrsetorder/ns3/named.conf.j2
@@ -12,7 +12,4 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}

diff --git a/bin/tests/system/rrsetorder/ns4/named.conf.j2 b/bin/tests/system/rrsetorder/ns4/named.conf.j2
index 636fbed1564739e6b1cb3f2b1739ce8115ea9e0f..e41e26b23f296f466b6028e5e8524966410ac31b 100644 (file)
--- a/bin/tests/system/rrsetorder/ns4/named.conf.j2
+++ b/bin/tests/system/rrsetorder/ns4/named.conf.j2
@@ -9,7 +9,4 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}

diff --git a/bin/tests/system/rrsetorder/ns5/named.conf.j2 b/bin/tests/system/rrsetorder/ns5/named.conf.j2
index 1aff3cc702214c97bf70d40dc82cdc580fe542ec..4a5e0029be0f25a18072cc5723e0c47b041c39b1 100644 (file)
--- a/bin/tests/system/rrsetorder/ns5/named.conf.j2
+++ b/bin/tests/system/rrsetorder/ns5/named.conf.j2
@@ -5,7 +5,4 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}

diff --git a/bin/tests/system/rsabigexponent/ns2/named.conf.j2 b/bin/tests/system/rsabigexponent/ns2/named.conf.j2
index 92abbc1c29ee563ad88c860b76fca563cb1e2e0c..fe239454b3697fd29ca8af7cd9f7aa039de680e8 100644 (file)
--- a/bin/tests/system/rsabigexponent/ns2/named.conf.j2
+++ b/bin/tests/system/rsabigexponent/ns2/named.conf.j2
@@ -8,10 +8,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
        type primary;

diff --git a/bin/tests/system/serve_stale_tcp/ns2/named.conf.j2 b/bin/tests/system/serve_stale_tcp/ns2/named.conf.j2
index 5a0b7a8e63850cf2b167f3212fd1148983f2f548..4cbcb6b62ebb85ee1765bd21fa8c2a436927cfd2 100644 (file)
--- a/bin/tests/system/serve_stale_tcp/ns2/named.conf.j2
+++ b/bin/tests/system/serve_stale_tcp/ns2/named.conf.j2
@@ -28,7 +28,4 @@ options {
        stale-answer-client-timeout off;
 };
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}

diff --git a/bin/tests/system/sfcache/ns2/named.conf.j2 b/bin/tests/system/sfcache/ns2/named.conf.j2
index e24808b1fac8c2eae9f52fd8ad2406efbcbb3707..6181d65809780013fe2dad61504c63ff87a9d145 100644 (file)
--- a/bin/tests/system/sfcache/ns2/named.conf.j2
+++ b/bin/tests/system/sfcache/ns2/named.conf.j2
@@ -8,10 +8,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
        type primary;

diff --git a/bin/tests/system/sfcache/ns5/named.conf.j2 b/bin/tests/system/sfcache/ns5/named.conf.j2
index 96b98f138a87060b86318fdd17857934e75c104e..4f79a230f1b98109dce689ccac4e49d591126180 100644 (file)
--- a/bin/tests/system/sfcache/ns5/named.conf.j2
+++ b/bin/tests/system/sfcache/ns5/named.conf.j2
@@ -10,9 +10,6 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 include "trusted.conf";

diff --git a/bin/tests/system/srtt/ns6/named.conf.j2 b/bin/tests/system/srtt/ns6/named.conf.j2
index cd4b2b8f6ee4f50a9c610ae51fc84215d1f75cdf..b634a8e4518baafd1d5e71a7e5b74e09249f6085 100644 (file)
--- a/bin/tests/system/srtt/ns6/named.conf.j2
+++ b/bin/tests/system/srtt/ns6/named.conf.j2
@@ -21,7 +21,4 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}

diff --git a/bin/tests/system/staticstub/ns2/named.conf.j2 b/bin/tests/system/staticstub/ns2/named.conf.j2
index 2d0386db044dd1095c37a36126a346fb8a48936f..b2aede9edc3fc9ba6740eb06b8263a0dbb270b41 100644 (file)
--- a/bin/tests/system/staticstub/ns2/named.conf.j2
+++ b/bin/tests/system/staticstub/ns2/named.conf.j2
@@ -11,10 +11,7 @@ options {
        minimal-responses no;
 };
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
        type static-stub;

diff --git a/bin/tests/system/statistics/ns2/named1.conf.j2 b/bin/tests/system/statistics/ns2/named1.conf.j2
index 3149b99d66f9ada3e0c5b903d82c5fcb83ab0525..e944ffda011668db52e4ea997618109a32cabffd 100644 (file)
--- a/bin/tests/system/statistics/ns2/named1.conf.j2
+++ b/bin/tests/system/statistics/ns2/named1.conf.j2
@@ -12,10 +12,7 @@ statistics-channels {
 {% include "_common/controls.conf.j2" %}
 
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
        type primary;

diff --git a/bin/tests/system/statistics/ns2/named2.conf.j2 b/bin/tests/system/statistics/ns2/named2.conf.j2
index 6acaab8f34a4daf06a88f79dfb86eb120af54d86..e7757d74ff32f051cc36a6fcf7d15774e2267f8d 100644 (file)
--- a/bin/tests/system/statistics/ns2/named2.conf.j2
+++ b/bin/tests/system/statistics/ns2/named2.conf.j2
@@ -12,10 +12,7 @@ statistics-channels {
 {% include "_common/controls.conf.j2" %}
 
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
        type primary;

diff --git a/bin/tests/system/stub/ns2/named.conf.j2 b/bin/tests/system/stub/ns2/named.conf.j2
index 2b5999e2284b5ec84642604fccfd142406db0f1b..dcfa6a171b3c8e27cd9f4a550a11d71f8482cb28 100644 (file)
--- a/bin/tests/system/stub/ns2/named.conf.j2
+++ b/bin/tests/system/stub/ns2/named.conf.j2
@@ -7,10 +7,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "child.example" {
        type primary;

diff --git a/bin/tests/system/stub/ns3/named.conf.j2 b/bin/tests/system/stub/ns3/named.conf.j2
index 74274d67c7497e7693b37d53ddea3a19ed149876..fe123f771f5bd3134f0b29b179a38b4176eaa213 100644 (file)
--- a/bin/tests/system/stub/ns3/named.conf.j2
+++ b/bin/tests/system/stub/ns3/named.conf.j2
@@ -6,10 +6,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
        type primary;

diff --git a/bin/tests/system/stub/ns5/named.conf.j2 b/bin/tests/system/stub/ns5/named.conf.j2
index aeea20d7eeac37cb77868a12dedc7350ad5067e3..eac65ee0700f349717e106fe2b96e31f085fc863 100644 (file)
--- a/bin/tests/system/stub/ns5/named.conf.j2
+++ b/bin/tests/system/stub/ns5/named.conf.j2
@@ -5,10 +5,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
        type stub;

diff --git a/bin/tests/system/tcp/ns2/named.conf.j2 b/bin/tests/system/tcp/ns2/named.conf.j2
index b9f21db3e55f11c26bb29ff7e1f0a14e97a963af..acb68cc00839af600432a4343c25e58647ea82d5 100644 (file)
--- a/bin/tests/system/tcp/ns2/named.conf.j2
+++ b/bin/tests/system/tcp/ns2/named.conf.j2
@@ -7,10 +7,7 @@ options {
 {% include "_common/controls.conf.j2" %}
 
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
        type primary;

diff --git a/bin/tests/system/tcp/ns3/named.conf.j2 b/bin/tests/system/tcp/ns3/named.conf.j2
index 5c6b735e1c7bc8aa6c419545cceefbc50e2ce300..07b8816a99c0f783036e9f2defac47ac7db71976 100644 (file)
--- a/bin/tests/system/tcp/ns3/named.conf.j2
+++ b/bin/tests/system/tcp/ns3/named.conf.j2
@@ -7,7 +7,4 @@ server 10.53.0.1 { tcp-only yes; };
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}

diff --git a/bin/tests/system/tcp/ns4/named.conf.j2 b/bin/tests/system/tcp/ns4/named.conf.j2
index 953e1c928c5639fee995ed2fbbd726b1fe583545..f30392c0d79bdb0feba8bfa2be285b90a2a2d684 100644 (file)
--- a/bin/tests/system/tcp/ns4/named.conf.j2
+++ b/bin/tests/system/tcp/ns4/named.conf.j2
@@ -9,7 +9,4 @@ server 10.53.0.2 { tcp-only yes; };
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}

diff --git a/bin/tests/system/tcp/ns5/named.conf.j2 b/bin/tests/system/tcp/ns5/named.conf.j2
index e4568b7403e89d855a8e9c58dc093cecb8001a04..b8dad4269ec3f9cf68aa57383d00388ac40ed118 100644 (file)
--- a/bin/tests/system/tcp/ns5/named.conf.j2
+++ b/bin/tests/system/tcp/ns5/named.conf.j2
@@ -10,7 +10,4 @@ options {
        dnssec-validation no;
 };
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}

diff --git a/bin/tests/system/ttl/ns1/named.conf.j2 b/bin/tests/system/ttl/ns1/named.conf.j2
index 7c498878e00da6b02d7d610c9e15b78a028411a6..28e4879c7f1f3e9d1c2bec92b5daee89646f6ccd 100644 (file)
--- a/bin/tests/system/ttl/ns1/named.conf.j2
+++ b/bin/tests/system/ttl/ns1/named.conf.j2
@@ -7,10 +7,7 @@ options {
        check-integrity no;
 };
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "min-example" {
        type primary;

diff --git a/bin/tests/system/views/ns2/named.conf.j2 b/bin/tests/system/views/ns2/named.conf.j2
index bbe5e1ec9d419b1b65b6b6d3e1c6c873cc2af778..7c3a5855f0c6f2aa1ca8c79bdbd219208c83a45a 100644 (file)
--- a/bin/tests/system/views/ns2/named.conf.j2
+++ b/bin/tests/system/views/ns2/named.conf.j2
@@ -13,10 +13,7 @@ dnssec-policy "views" {
        };
 };
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
        type primary;

diff --git a/bin/tests/system/views/ns3/named.conf.j2 b/bin/tests/system/views/ns3/named.conf.j2
index ae705222bbede6358c52fe37af314734b508f597..b17af1bc109dc13b4c58a54b230c3047a1c26d6f 100644 (file)
--- a/bin/tests/system/views/ns3/named.conf.j2
+++ b/bin/tests/system/views/ns3/named.conf.j2
@@ -5,10 +5,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
        type primary;

diff --git a/bin/tests/system/views/ns3/named2.conf.j2 b/bin/tests/system/views/ns3/named2.conf.j2
index 6bd2e08896552e9b3f98bc5b680c3f8ed0f9d823..644916fb1c7d70463928e75841ca7bfb5fd70c02 100644 (file)
--- a/bin/tests/system/views/ns3/named2.conf.j2
+++ b/bin/tests/system/views/ns3/named2.conf.j2
@@ -5,10 +5,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
        type secondary;

diff --git a/bin/tests/system/views/ns5/named.conf.j2 b/bin/tests/system/views/ns5/named.conf.j2
index dbdd18f68545b8947f93c99b70349ebacfca9e20..30d7f8cc7fae458ee975a8744314a04e847b54f1 100644 (file)
--- a/bin/tests/system/views/ns5/named.conf.j2
+++ b/bin/tests/system/views/ns5/named.conf.j2
@@ -5,10 +5,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "child.clone" {
        type primary;

diff --git a/bin/tests/system/wildcard/ns2/named.conf.j2 b/bin/tests/system/wildcard/ns2/named.conf.j2
index 1aff3cc702214c97bf70d40dc82cdc580fe542ec..4a5e0029be0f25a18072cc5723e0c47b041c39b1 100644 (file)
--- a/bin/tests/system/wildcard/ns2/named.conf.j2
+++ b/bin/tests/system/wildcard/ns2/named.conf.j2
@@ -5,7 +5,4 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}

diff --git a/bin/tests/system/wildcard/ns3/named.conf.j2 b/bin/tests/system/wildcard/ns3/named.conf.j2
index 423cf682a73ad545694c0e51bebf6ce269866330..d0c559e2ff0cef3c90a2dc332055fd89b00fc0b9 100644 (file)
--- a/bin/tests/system/wildcard/ns3/named.conf.j2
+++ b/bin/tests/system/wildcard/ns3/named.conf.j2
@@ -7,7 +7,4 @@ options {
 
 include "../ns1/trusted.conf";
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}

diff --git a/bin/tests/system/wildcard/ns5/named.conf.j2 b/bin/tests/system/wildcard/ns5/named.conf.j2
index 423cf682a73ad545694c0e51bebf6ce269866330..d0c559e2ff0cef3c90a2dc332055fd89b00fc0b9 100644 (file)
--- a/bin/tests/system/wildcard/ns5/named.conf.j2
+++ b/bin/tests/system/wildcard/ns5/named.conf.j2
@@ -7,7 +7,4 @@ options {
 
 include "../ns1/trusted.conf";
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}

diff --git a/bin/tests/system/xfer/ns2/named.conf.j2 b/bin/tests/system/xfer/ns2/named.conf.j2
index 791f826e9fac3c176316b1a64460f3d45f236e9e..64125866208a11fe0d8eea8144155d4592a0e9aa 100644 (file)
--- a/bin/tests/system/xfer/ns2/named.conf.j2
+++ b/bin/tests/system/xfer/ns2/named.conf.j2
@@ -18,10 +18,7 @@ acl tzkey {
        key tsigzone.;
 };
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
        type primary;

diff --git a/bin/tests/system/xfer/ns3/named.conf.j2 b/bin/tests/system/xfer/ns3/named.conf.j2
index 8052a92741881e4c7297aea074c089c814441744..1ae5503b14d0e7b6b05a5e89bf3ee8ba42613ab8 100644 (file)
--- a/bin/tests/system/xfer/ns3/named.conf.j2
+++ b/bin/tests/system/xfer/ns3/named.conf.j2
@@ -11,10 +11,7 @@ key tsigzone. {
        secret "1234abcd8765";
 };
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
        type secondary;

diff --git a/bin/tests/system/xfer/ns6/named.conf.j2 b/bin/tests/system/xfer/ns6/named.conf.j2
index 9d6c31947b57edb1550b588fcc6a165d2763aaa5..8a4845994addb0d12ca0c6288df6a9be99deebb5 100644 (file)
--- a/bin/tests/system/xfer/ns6/named.conf.j2
+++ b/bin/tests/system/xfer/ns6/named.conf.j2
@@ -11,10 +11,7 @@ options {
        min-transfer-rate-in 10240 300;  # this is tested as seconds, when used with '-T transferinsecs' (i.e. convert the default '10240 5' back so that it doesn't interfere with other tests)
 };
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "primary" {
        type primary;

diff --git a/bin/tests/system/xfer/ns7/named.conf.j2 b/bin/tests/system/xfer/ns7/named.conf.j2
index 0b677a7e5747e6cc7ba4820b4713e1232327c3f3..cc1e70dbdb71d70ad7a9e9b5c4aefe5848be7af8 100644 (file)
--- a/bin/tests/system/xfer/ns7/named.conf.j2
+++ b/bin/tests/system/xfer/ns7/named.conf.j2
@@ -9,10 +9,7 @@ options {
        check-integrity no;
 };
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "primary2" {
        type primary;

diff --git a/bin/tests/system/xferquota/ns2/named.conf.j2 b/bin/tests/system/xferquota/ns2/named.conf.j2
index 62e3f4f88ca563573ec723d55960a84afed8f8ee..d681e72fc6a7a7f9a8a706fcba1475d320c64fb9 100644 (file)
--- a/bin/tests/system/xferquota/ns2/named.conf.j2
+++ b/bin/tests/system/xferquota/ns2/named.conf.j2
@@ -11,10 +11,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "changing." {
        type secondary;