]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Use the shared root hint file where local copies matched
authorNicki Křížek <nicki@isc.org>
Thu, 23 Jul 2026 16:52:14 +0000 (16:52 +0000)
committerNicki Křížek <nicki@isc.org>
Thu, 6 Aug 2026 11:50:09 +0000 (13:50 +0200)
Use a shared root hint file and template in tests which had an identical
local copy of a root hint file.

Assisted-by: Claude:claude-fable-5
41 files changed:
bin/tests/system/camp/ns9/hints.db [deleted file]
bin/tests/system/camp/ns9/named.conf.j2
bin/tests/system/cap_glues/ns3/named.conf.j2
bin/tests/system/cap_glues/ns3/root.hint [deleted file]
bin/tests/system/chain/ns7/named.conf.j2
bin/tests/system/chain/ns7/root.hint [deleted file]
bin/tests/system/delegation_ttl/ns2/named.conf.j2
bin/tests/system/delegation_ttl/ns2/root.hint [deleted file]
bin/tests/system/dns64_dname/ns2/named.conf.j2
bin/tests/system/dns64_dname/ns2/root.hint [deleted file]
bin/tests/system/expiredglue/ns4/named.conf.j2
bin/tests/system/expiredglue/ns4/root.hint [deleted file]
bin/tests/system/fetchlimit/ns3/named.conf.j2
bin/tests/system/fetchlimit/ns3/named2.conf.j2
bin/tests/system/fetchlimit/ns3/named3.conf.j2
bin/tests/system/fetchlimit/ns3/root.hint [deleted file]
bin/tests/system/fetchlimit/ns5/named.conf.j2
bin/tests/system/fetchlimit/ns5/named2.conf.j2
bin/tests/system/fetchlimit/ns5/named3.conf.j2
bin/tests/system/fetchlimit/ns5/root.hint [deleted file]
bin/tests/system/forward/ns8/named.conf.j2
bin/tests/system/forward/ns8/root.db [deleted file]
bin/tests/system/forward/ns9/named.conf.j2
bin/tests/system/forward/ns9/named2.conf.j2
bin/tests/system/forward/ns9/named3.conf.j2
bin/tests/system/forward/ns9/named4.conf.j2
bin/tests/system/forward/ns9/root.db [deleted file]
bin/tests/system/nslimit_outdomain/ns4/named.conf.j2
bin/tests/system/nslimit_outdomain/ns4/root.hint [deleted file]
bin/tests/system/nsprocessinglimit/ns4/named.conf.j2
bin/tests/system/nsprocessinglimit/ns4/root.hint [deleted file]
bin/tests/system/query_source/ns3/named.conf.j2
bin/tests/system/query_source/ns3/root.hint [deleted file]
bin/tests/system/query_source/ns4/named.conf.j2
bin/tests/system/query_source/ns4/root.hint [deleted file]
bin/tests/system/rootkeysentinel/ns3/hint.db [deleted file]
bin/tests/system/rootkeysentinel/ns3/named.conf.j2
bin/tests/system/rootkeysentinel/ns4/hint.db [deleted file]
bin/tests/system/rootkeysentinel/ns4/named.conf.j2
bin/tests/system/selfpointedglue/ns4/named.conf.j2
bin/tests/system/selfpointedglue/ns4/root.hint [deleted file]

diff --git a/bin/tests/system/camp/ns9/hints.db b/bin/tests/system/camp/ns9/hints.db
deleted file mode 100644 (file)
index 738dab1..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-. 60 IN NS a.root-servers.nil.
-a.root-servers.nil.     A       10.53.0.1
index 5c8365c29a7e0f94f9ca4ea58f308a4fb1200d91..d172b2b13d3568d39019b6d33c05a342e1c4152a 100644 (file)
@@ -11,4 +11,4 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." { type hint; file "hints.db"; };
+{% include "_common/root.hint.conf" %}
index da196ad9f348705e3b0217d79cf5f649068213ce..eb4e3e5a3339806dc1e537a6d22275203d6a72db 100644 (file)
@@ -10,9 +10,6 @@ server 10.53.0.2 {
        tcp-only yes;
 };
 
-zone "." {
-       type hint;
-       file "root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 {% include "_common/controls.conf.j2" %}
diff --git a/bin/tests/system/cap_glues/ns3/root.hint b/bin/tests/system/cap_glues/ns3/root.hint
deleted file mode 100644 (file)
index fd81838..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-$TTL 999999
-.                       IN NS          a.root-servers.nil.
-a.root-servers.nil.     IN A           10.53.0.1
index 7b7b1d6a2a1cd6d81df83040505e52e4384da573..9eb77b1fb01e8f78433255d29560f8cd339341a0 100644 (file)
@@ -22,15 +22,9 @@ view restart16 {
        match-clients { key restart16; none; };
        max-query-restarts 16;
 
-       zone "." {
-               type hint;
-               file "root.hint";
-       };
+       {% include_indented "_common/root.hint.conf" %}
 };
 
 view default {
-       zone "." {
-               type hint;
-               file "root.hint";
-       };
+       {% include_indented "_common/root.hint.conf" %}
 };
diff --git a/bin/tests/system/chain/ns7/root.hint b/bin/tests/system/chain/ns7/root.hint
deleted file mode 100644 (file)
index 8ed47ff..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-$TTL 999999
-.                        IN NS  a.root-servers.nil.
-a.root-servers.nil.      IN A   10.53.0.1
index 40a4dab05dde2182d7dc2efb96edff2e5ef6a77f..9c68f3954f933053d1e50c05dee04d39d8e4af5d 100644 (file)
@@ -12,9 +12,6 @@ options {
 {% endif %}
 };
 
-zone "." {
-       type hint;
-       file "root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 {% include "_common/controls.conf.j2" %}
diff --git a/bin/tests/system/delegation_ttl/ns2/root.hint b/bin/tests/system/delegation_ttl/ns2/root.hint
deleted file mode 100644 (file)
index d7d0e1f..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-;
-; SPDX-License-Identifier: MPL-2.0
-;
-; This Source Code Form is subject to the terms of the Mozilla Public
-; License, v. 2.0.  If a copy of the MPL was not distributed with this
-; file, you can obtain one at https://mozilla.org/MPL/2.0/.
-;
-; See the COPYRIGHT file distributed with this work for additional
-; information regarding copyright ownership.
-
-$TTL 999999
-.                       IN NS          a.root-servers.nil.
-a.root-servers.nil.     IN A           10.53.0.1
index 4dad8ccc61105f7b962361bf142490d9549647de..4c37ac7c5114f798da296e24be7b9ae666f31802 100644 (file)
@@ -11,7 +11,4 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "root.hint";
-};
+{% include "_common/root.hint.conf" %}
diff --git a/bin/tests/system/dns64_dname/ns2/root.hint b/bin/tests/system/dns64_dname/ns2/root.hint
deleted file mode 100644 (file)
index f0a5d52..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-.                      NS      a.root-servers.nil.
-a.root-servers.nil.    A       10.53.0.1
index 3b2e2068ab84a74d0a31c74bd0fda5fef3d6bbb6..b5d854701eada6b9504d13674c5b508683fa7bd4 100644 (file)
@@ -3,9 +3,6 @@ options {
        dnssec-validation no;
 };
 
-zone "." {
-       type hint;
-       file "root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 {% include "_common/controls.conf.j2" %}
diff --git a/bin/tests/system/expiredglue/ns4/root.hint b/bin/tests/system/expiredglue/ns4/root.hint
deleted file mode 100644 (file)
index fd81838..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-$TTL 999999
-.                       IN NS          a.root-servers.nil.
-a.root-servers.nil.     IN A           10.53.0.1
index faa0d733f8e28ac4b39ad30fcf261c115ab7341c..e949a3a19dadb295780704ea6d03bfa943556ef4 100644 (file)
@@ -11,7 +11,4 @@ server 10.53.0.4 {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "root.hint";
-};
+{% include "_common/root.hint.conf" %}
index 64f08b0e6de6f83a20437144cb9604409f4d53fc..513c0509167d31e64447e701d682a306bff4ca91 100644 (file)
@@ -11,7 +11,4 @@ server 10.53.0.4 {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "root.hint";
-};
+{% include "_common/root.hint.conf" %}
index e269fe3e4e8ea32d38d5f65e060d67ee7d3fa340..20fcdf3fe09c3683374087fa81f4b59ea17ee2c3 100644 (file)
@@ -11,7 +11,4 @@ server 10.53.0.4 {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "root.hint";
-};
+{% include "_common/root.hint.conf" %}
diff --git a/bin/tests/system/fetchlimit/ns3/root.hint b/bin/tests/system/fetchlimit/ns3/root.hint
deleted file mode 100644 (file)
index 753aa03..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-$TTL 999999
-.                       IN NS  a.root-servers.nil.
-a.root-servers.nil.     IN A   10.53.0.1
index 02be4a306539c68fae895732d5812580922852c6..8462ae806a5822a8ce27e12bcc08b030460f4cda 100644 (file)
@@ -12,7 +12,4 @@ server 10.53.0.4 {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "root.hint";
-};
+{% include "_common/root.hint.conf" %}
index 146746addd5afc665b583660b7f4809a20aa7f43..bfbc3a66f600e7486927a18c6ea55771f066f175 100644 (file)
@@ -15,7 +15,4 @@ server 10.53.0.4 {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "root.hint";
-};
+{% include "_common/root.hint.conf" %}
index 4c524681cf68f2b7005a3cf3ad3a7000f5dea02c..d9c64099e70b64f14510fba17760a270da09f224 100644 (file)
@@ -16,7 +16,4 @@ server 10.53.0.4 {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "root.hint";
-};
+{% include "_common/root.hint.conf" %}
diff --git a/bin/tests/system/fetchlimit/ns5/root.hint b/bin/tests/system/fetchlimit/ns5/root.hint
deleted file mode 100644 (file)
index 753aa03..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-$TTL 999999
-.                       IN NS  a.root-servers.nil.
-a.root-servers.nil.     IN A   10.53.0.1
index 1d7a266ff4ab395eaa2da179a79b9d2a693724db..229cd09a2d43ad6829ff0c6c0fb0cbb536528268 100644 (file)
@@ -7,10 +7,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "root.db";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "sub.local.tld" {
        type primary;
diff --git a/bin/tests/system/forward/ns8/root.db b/bin/tests/system/forward/ns8/root.db
deleted file mode 100644 (file)
index f0a5d52..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-.                      NS      a.root-servers.nil.
-a.root-servers.nil.    A       10.53.0.1
index a49d8d42874c8aab19bcb1e9bcbc606a37a62cdc..e17d8dfe45fdbe8d92721053e6498c0ae6e78b84 100644 (file)
@@ -14,10 +14,7 @@ server 10.53.0.11 {
        edns no;
 };
 
-zone "." {
-       type hint;
-       file "root.db";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "attacksecuredomain.net." {
        type forward;
index 673a27789211cad93d03790e401ec6199072bf4a..af4d4bba3b934063cb18bf3a42417447b22330ea 100644 (file)
@@ -14,10 +14,7 @@ server 10.53.0.11 {
        edns no;
 };
 
-zone "." {
-       type hint;
-       file "root.db";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "attacksecuredomain.net." {
        type forward;
index 6186195d74394175bbc0fa453302517c4f93249b..1d31a6202d91c62d1416113d8ee9e19618ec4851 100644 (file)
@@ -12,10 +12,7 @@ server 10.53.0.10 {
        edns no;
 };
 
-zone "." {
-       type hint;
-       file "root.db";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "local.net." {
        type primary;
index 5c5b6606aa2bb0a68351b9c347f9195997a0322c..537627790f375e1286dfa564e1395ef671f27d4c 100644 (file)
@@ -10,10 +10,7 @@ server 10.53.0.10 {
        edns no;
 };
 
-zone "." {
-       type hint;
-       file "root.db";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "local.tld." {
        type primary;
diff --git a/bin/tests/system/forward/ns9/root.db b/bin/tests/system/forward/ns9/root.db
deleted file mode 100644 (file)
index f0a5d52..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-.                      NS      a.root-servers.nil.
-a.root-servers.nil.    A       10.53.0.1
index b1e285930c0c81052ad131f7f13b39dd94d1036a..2aecea1cd36c19f26f9eb32e12a128073def7741 100644 (file)
@@ -38,9 +38,6 @@ server 10.53.1.1 { tcp-only true; };
 server 10.53.1.2 { tcp-only true; };
 server 10.53.2.1 { tcp-only true; };
 
-zone "." {
-       type hint;
-       file "root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 {% include "_common/controls.conf.j2" %}
diff --git a/bin/tests/system/nslimit_outdomain/ns4/root.hint b/bin/tests/system/nslimit_outdomain/ns4/root.hint
deleted file mode 100644 (file)
index d7d0e1f..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-;
-; SPDX-License-Identifier: MPL-2.0
-;
-; This Source Code Form is subject to the terms of the Mozilla Public
-; License, v. 2.0.  If a copy of the MPL was not distributed with this
-; file, you can obtain one at https://mozilla.org/MPL/2.0/.
-;
-; See the COPYRIGHT file distributed with this work for additional
-; information regarding copyright ownership.
-
-$TTL 999999
-.                       IN NS          a.root-servers.nil.
-a.root-servers.nil.     IN A           10.53.0.1
index a98b247f3a83aeb5838513a7953d75029fb62b2e..12ca03f3bed2d43fac2d7855134d657ce3ea7f9c 100644 (file)
@@ -10,9 +10,6 @@ options {
        {% endif %}
 };
 
-zone "." {
-       type hint;
-       file "root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 {% include "_common/controls.conf.j2" %}
diff --git a/bin/tests/system/nsprocessinglimit/ns4/root.hint b/bin/tests/system/nsprocessinglimit/ns4/root.hint
deleted file mode 100644 (file)
index fd81838..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-$TTL 999999
-.                       IN NS          a.root-servers.nil.
-a.root-servers.nil.     IN A           10.53.0.1
index bacd873ed34b14b5c555963dcfbfaedc7d7e762b..7a7f771f799d8ba62d32fab1ec6897890479d3dd 100644 (file)
@@ -8,7 +8,4 @@ options {
        query-source 10.53.0.3;
 };
 
-zone "." {
-       type hint;
-       file "root.hint";
-};
+{% include "_common/root.hint.conf" %}
diff --git a/bin/tests/system/query_source/ns3/root.hint b/bin/tests/system/query_source/ns3/root.hint
deleted file mode 100644 (file)
index 753aa03..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-$TTL 999999
-.                       IN NS  a.root-servers.nil.
-a.root-servers.nil.     IN A   10.53.0.1
index e5901faf5ef605b13b9be22a23003e494f368743..f14810c018698f5ef581c6a6b1b57d9b64a088cc 100644 (file)
@@ -8,7 +8,4 @@ options {
        query-source-v6 fd92:7065:b8e:ffff::4;
 };
 
-zone "." {
-       type hint;
-       file "root.hint";
-};
+{% include "_common/root.hint.conf" %}
diff --git a/bin/tests/system/query_source/ns4/root.hint b/bin/tests/system/query_source/ns4/root.hint
deleted file mode 100644 (file)
index 8e99917..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-$TTL 999999
-.                       IN NS  a.root-servers.nil.
-a.root-servers.nil.     IN  A  10.53.0.1
diff --git a/bin/tests/system/rootkeysentinel/ns3/hint.db b/bin/tests/system/rootkeysentinel/ns3/hint.db
deleted file mode 100644 (file)
index bcd3e4b..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-.                       NS      a.root-servers.nil.
-a.root-servers.nil.     A       10.53.0.1
index 10485eeb0c03c895aa67860b7562ffacbfb4c276..fb5e808c924ed7a358b655b3f3afcb85ac3aa5ab 100644 (file)
@@ -6,9 +6,6 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "hint.db";
-};
+{% include "_common/root.hint.conf" %}
 
 include "trusted.conf";
diff --git a/bin/tests/system/rootkeysentinel/ns4/hint.db b/bin/tests/system/rootkeysentinel/ns4/hint.db
deleted file mode 100644 (file)
index bcd3e4b..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-.                       NS      a.root-servers.nil.
-a.root-servers.nil.     A       10.53.0.1
index 42d3852ac89f340de3234966d6fc4044af2b871a..25ae43324c76ad0c2f3fa0c897b876e26577fa4f 100644 (file)
@@ -6,9 +6,6 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-       type hint;
-       file "hint.db";
-};
+{% include "_common/root.hint.conf" %}
 
 include "trusted.conf";
index b1e285930c0c81052ad131f7f13b39dd94d1036a..2aecea1cd36c19f26f9eb32e12a128073def7741 100644 (file)
@@ -38,9 +38,6 @@ server 10.53.1.1 { tcp-only true; };
 server 10.53.1.2 { tcp-only true; };
 server 10.53.2.1 { tcp-only true; };
 
-zone "." {
-       type hint;
-       file "root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 {% include "_common/controls.conf.j2" %}
diff --git a/bin/tests/system/selfpointedglue/ns4/root.hint b/bin/tests/system/selfpointedglue/ns4/root.hint
deleted file mode 100644 (file)
index d7d0e1f..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-;
-; SPDX-License-Identifier: MPL-2.0
-;
-; This Source Code Form is subject to the terms of the Mozilla Public
-; License, v. 2.0.  If a copy of the MPL was not distributed with this
-; file, you can obtain one at https://mozilla.org/MPL/2.0/.
-;
-; See the COPYRIGHT file distributed with this work for additional
-; information regarding copyright ownership.
-
-$TTL 999999
-.                       IN NS          a.root-servers.nil.
-a.root-servers.nil.     IN A           10.53.0.1