From: Nicki Křížek Date: Thu, 23 Jul 2026 16:52:14 +0000 (+0000) Subject: Use the shared root hint file where local copies matched X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b8e89246bc19170667ccb784a677d3b7e7a860a2;p=thirdparty%2Fbind9.git Use the shared root hint file where local copies matched 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 --- diff --git a/bin/tests/system/camp/ns9/hints.db b/bin/tests/system/camp/ns9/hints.db deleted file mode 100644 index 738dab11eff..00000000000 --- a/bin/tests/system/camp/ns9/hints.db +++ /dev/null @@ -1,2 +0,0 @@ -. 60 IN NS a.root-servers.nil. -a.root-servers.nil. A 10.53.0.1 diff --git a/bin/tests/system/camp/ns9/named.conf.j2 b/bin/tests/system/camp/ns9/named.conf.j2 index 5c8365c29a7..d172b2b13d3 100644 --- a/bin/tests/system/camp/ns9/named.conf.j2 +++ b/bin/tests/system/camp/ns9/named.conf.j2 @@ -11,4 +11,4 @@ options { {% include "_common/controls.conf.j2" %} -zone "." { type hint; file "hints.db"; }; +{% include "_common/root.hint.conf" %} diff --git a/bin/tests/system/cap_glues/ns3/named.conf.j2 b/bin/tests/system/cap_glues/ns3/named.conf.j2 index da196ad9f34..eb4e3e5a333 100644 --- a/bin/tests/system/cap_glues/ns3/named.conf.j2 +++ b/bin/tests/system/cap_glues/ns3/named.conf.j2 @@ -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 index fd81838ef82..00000000000 --- a/bin/tests/system/cap_glues/ns3/root.hint +++ /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/chain/ns7/named.conf.j2 b/bin/tests/system/chain/ns7/named.conf.j2 index 7b7b1d6a2a1..9eb77b1fb01 100644 --- a/bin/tests/system/chain/ns7/named.conf.j2 +++ b/bin/tests/system/chain/ns7/named.conf.j2 @@ -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 index 8ed47ffea6c..00000000000 --- a/bin/tests/system/chain/ns7/root.hint +++ /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/delegation_ttl/ns2/named.conf.j2 b/bin/tests/system/delegation_ttl/ns2/named.conf.j2 index 40a4dab05dd..9c68f3954f9 100644 --- a/bin/tests/system/delegation_ttl/ns2/named.conf.j2 +++ b/bin/tests/system/delegation_ttl/ns2/named.conf.j2 @@ -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 index d7d0e1fabac..00000000000 --- a/bin/tests/system/delegation_ttl/ns2/root.hint +++ /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 diff --git a/bin/tests/system/dns64_dname/ns2/named.conf.j2 b/bin/tests/system/dns64_dname/ns2/named.conf.j2 index 4dad8ccc611..4c37ac7c511 100644 --- a/bin/tests/system/dns64_dname/ns2/named.conf.j2 +++ b/bin/tests/system/dns64_dname/ns2/named.conf.j2 @@ -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 index f0a5d52f70a..00000000000 --- a/bin/tests/system/dns64_dname/ns2/root.hint +++ /dev/null @@ -1,2 +0,0 @@ -. NS a.root-servers.nil. -a.root-servers.nil. A 10.53.0.1 diff --git a/bin/tests/system/expiredglue/ns4/named.conf.j2 b/bin/tests/system/expiredglue/ns4/named.conf.j2 index 3b2e2068ab8..b5d854701ea 100644 --- a/bin/tests/system/expiredglue/ns4/named.conf.j2 +++ b/bin/tests/system/expiredglue/ns4/named.conf.j2 @@ -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 index fd81838ef82..00000000000 --- a/bin/tests/system/expiredglue/ns4/root.hint +++ /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/fetchlimit/ns3/named.conf.j2 b/bin/tests/system/fetchlimit/ns3/named.conf.j2 index faa0d733f8e..e949a3a19da 100644 --- a/bin/tests/system/fetchlimit/ns3/named.conf.j2 +++ b/bin/tests/system/fetchlimit/ns3/named.conf.j2 @@ -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/named2.conf.j2 b/bin/tests/system/fetchlimit/ns3/named2.conf.j2 index 64f08b0e6de..513c0509167 100644 --- a/bin/tests/system/fetchlimit/ns3/named2.conf.j2 +++ b/bin/tests/system/fetchlimit/ns3/named2.conf.j2 @@ -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/named3.conf.j2 b/bin/tests/system/fetchlimit/ns3/named3.conf.j2 index e269fe3e4e8..20fcdf3fe09 100644 --- a/bin/tests/system/fetchlimit/ns3/named3.conf.j2 +++ b/bin/tests/system/fetchlimit/ns3/named3.conf.j2 @@ -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 index 753aa036841..00000000000 --- a/bin/tests/system/fetchlimit/ns3/root.hint +++ /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/fetchlimit/ns5/named.conf.j2 b/bin/tests/system/fetchlimit/ns5/named.conf.j2 index 02be4a30653..8462ae806a5 100644 --- a/bin/tests/system/fetchlimit/ns5/named.conf.j2 +++ b/bin/tests/system/fetchlimit/ns5/named.conf.j2 @@ -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" %} diff --git a/bin/tests/system/fetchlimit/ns5/named2.conf.j2 b/bin/tests/system/fetchlimit/ns5/named2.conf.j2 index 146746addd5..bfbc3a66f60 100644 --- a/bin/tests/system/fetchlimit/ns5/named2.conf.j2 +++ b/bin/tests/system/fetchlimit/ns5/named2.conf.j2 @@ -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" %} diff --git a/bin/tests/system/fetchlimit/ns5/named3.conf.j2 b/bin/tests/system/fetchlimit/ns5/named3.conf.j2 index 4c524681cf6..d9c64099e70 100644 --- a/bin/tests/system/fetchlimit/ns5/named3.conf.j2 +++ b/bin/tests/system/fetchlimit/ns5/named3.conf.j2 @@ -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 index 753aa036841..00000000000 --- a/bin/tests/system/fetchlimit/ns5/root.hint +++ /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/forward/ns8/named.conf.j2 b/bin/tests/system/forward/ns8/named.conf.j2 index 1d7a266ff4a..229cd09a2d4 100644 --- a/bin/tests/system/forward/ns8/named.conf.j2 +++ b/bin/tests/system/forward/ns8/named.conf.j2 @@ -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 index f0a5d52f70a..00000000000 --- a/bin/tests/system/forward/ns8/root.db +++ /dev/null @@ -1,2 +0,0 @@ -. NS a.root-servers.nil. -a.root-servers.nil. A 10.53.0.1 diff --git a/bin/tests/system/forward/ns9/named.conf.j2 b/bin/tests/system/forward/ns9/named.conf.j2 index a49d8d42874..e17d8dfe45f 100644 --- a/bin/tests/system/forward/ns9/named.conf.j2 +++ b/bin/tests/system/forward/ns9/named.conf.j2 @@ -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; diff --git a/bin/tests/system/forward/ns9/named2.conf.j2 b/bin/tests/system/forward/ns9/named2.conf.j2 index 673a2778921..af4d4bba3b9 100644 --- a/bin/tests/system/forward/ns9/named2.conf.j2 +++ b/bin/tests/system/forward/ns9/named2.conf.j2 @@ -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; diff --git a/bin/tests/system/forward/ns9/named3.conf.j2 b/bin/tests/system/forward/ns9/named3.conf.j2 index 6186195d743..1d31a6202d9 100644 --- a/bin/tests/system/forward/ns9/named3.conf.j2 +++ b/bin/tests/system/forward/ns9/named3.conf.j2 @@ -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; diff --git a/bin/tests/system/forward/ns9/named4.conf.j2 b/bin/tests/system/forward/ns9/named4.conf.j2 index 5c5b6606aa2..537627790f3 100644 --- a/bin/tests/system/forward/ns9/named4.conf.j2 +++ b/bin/tests/system/forward/ns9/named4.conf.j2 @@ -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 index f0a5d52f70a..00000000000 --- a/bin/tests/system/forward/ns9/root.db +++ /dev/null @@ -1,2 +0,0 @@ -. NS a.root-servers.nil. -a.root-servers.nil. A 10.53.0.1 diff --git a/bin/tests/system/nslimit_outdomain/ns4/named.conf.j2 b/bin/tests/system/nslimit_outdomain/ns4/named.conf.j2 index b1e285930c0..2aecea1cd36 100644 --- a/bin/tests/system/nslimit_outdomain/ns4/named.conf.j2 +++ b/bin/tests/system/nslimit_outdomain/ns4/named.conf.j2 @@ -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 index d7d0e1fabac..00000000000 --- a/bin/tests/system/nslimit_outdomain/ns4/root.hint +++ /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 diff --git a/bin/tests/system/nsprocessinglimit/ns4/named.conf.j2 b/bin/tests/system/nsprocessinglimit/ns4/named.conf.j2 index a98b247f3a8..12ca03f3bed 100644 --- a/bin/tests/system/nsprocessinglimit/ns4/named.conf.j2 +++ b/bin/tests/system/nsprocessinglimit/ns4/named.conf.j2 @@ -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 index fd81838ef82..00000000000 --- a/bin/tests/system/nsprocessinglimit/ns4/root.hint +++ /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/query_source/ns3/named.conf.j2 b/bin/tests/system/query_source/ns3/named.conf.j2 index bacd873ed34..7a7f771f799 100644 --- a/bin/tests/system/query_source/ns3/named.conf.j2 +++ b/bin/tests/system/query_source/ns3/named.conf.j2 @@ -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 index 753aa036841..00000000000 --- a/bin/tests/system/query_source/ns3/root.hint +++ /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/query_source/ns4/named.conf.j2 b/bin/tests/system/query_source/ns4/named.conf.j2 index e5901faf5ef..f14810c0186 100644 --- a/bin/tests/system/query_source/ns4/named.conf.j2 +++ b/bin/tests/system/query_source/ns4/named.conf.j2 @@ -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 index 8e99917bdd1..00000000000 --- a/bin/tests/system/query_source/ns4/root.hint +++ /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 index bcd3e4b7f13..00000000000 --- a/bin/tests/system/rootkeysentinel/ns3/hint.db +++ /dev/null @@ -1,2 +0,0 @@ -. NS a.root-servers.nil. -a.root-servers.nil. A 10.53.0.1 diff --git a/bin/tests/system/rootkeysentinel/ns3/named.conf.j2 b/bin/tests/system/rootkeysentinel/ns3/named.conf.j2 index 10485eeb0c0..fb5e808c924 100644 --- a/bin/tests/system/rootkeysentinel/ns3/named.conf.j2 +++ b/bin/tests/system/rootkeysentinel/ns3/named.conf.j2 @@ -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 index bcd3e4b7f13..00000000000 --- a/bin/tests/system/rootkeysentinel/ns4/hint.db +++ /dev/null @@ -1,2 +0,0 @@ -. NS a.root-servers.nil. -a.root-servers.nil. A 10.53.0.1 diff --git a/bin/tests/system/rootkeysentinel/ns4/named.conf.j2 b/bin/tests/system/rootkeysentinel/ns4/named.conf.j2 index 42d3852ac89..25ae43324c7 100644 --- a/bin/tests/system/rootkeysentinel/ns4/named.conf.j2 +++ b/bin/tests/system/rootkeysentinel/ns4/named.conf.j2 @@ -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/selfpointedglue/ns4/named.conf.j2 b/bin/tests/system/selfpointedglue/ns4/named.conf.j2 index b1e285930c0..2aecea1cd36 100644 --- a/bin/tests/system/selfpointedglue/ns4/named.conf.j2 +++ b/bin/tests/system/selfpointedglue/ns4/named.conf.j2 @@ -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 index d7d0e1fabac..00000000000 --- a/bin/tests/system/selfpointedglue/ns4/root.hint +++ /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