Make root hints consistent with authoritative data

Multiple resolvers in the "wildcard" system test are configured with a
single root hint: "ns.root-servers.nil", pointing to 10.53.0.1, which is
inconsistent with authoritative data served by ns1.  This may cause
intermittent resolution failures, triggering false positives for the
"wildcard" system test.  Prevent this from happening by making ns2, ns3,
and ns5 use root hints corresponding to the contents of ns1/root.db.in.

(cherry picked from commit dd430c309311c727928b9160b8a04dc6381ca318)

diff --git a/bin/tests/system/wildcard/ns2/hints b/bin/tests/system/wildcard/ns2/hints
deleted file mode 100644 (file)
index b4b8f7a..0000000
--- a/bin/tests/system/wildcard/ns2/hints
+++ /dev/null
@@ -1,11 +0,0 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-;
-; 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 http://mozilla.org/MPL/2.0/.
-;
-; See the COPYRIGHT file distributed with this work for additional
-; information regarding copyright ownership.
-
-. 0 NS ns.root-servers.nil.
-ns.root-servers.nil. 0 A 10.53.0.1

diff --git a/bin/tests/system/wildcard/ns2/named.conf.in b/bin/tests/system/wildcard/ns2/named.conf.in
index 67a50fcbc0557a094c0d4f24286440b81ce5c1d2..af0e57b37d4634c56166126d361aa73af13b731d 100644 (file)
--- a/bin/tests/system/wildcard/ns2/named.conf.in
+++ b/bin/tests/system/wildcard/ns2/named.conf.in
@@ -21,4 +21,7 @@ options {
        notify yes;
 };
 
-zone "." { type hint; file "hints"; };
+zone "." {
+       type hint;
+       file "../../common/root.hint";
+};

diff --git a/bin/tests/system/wildcard/ns3/hints b/bin/tests/system/wildcard/ns3/hints
deleted file mode 100644 (file)
index b4b8f7a..0000000
--- a/bin/tests/system/wildcard/ns3/hints
+++ /dev/null
@@ -1,11 +0,0 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-;
-; 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 http://mozilla.org/MPL/2.0/.
-;
-; See the COPYRIGHT file distributed with this work for additional
-; information regarding copyright ownership.
-
-. 0 NS ns.root-servers.nil.
-ns.root-servers.nil. 0 A 10.53.0.1

diff --git a/bin/tests/system/wildcard/ns3/named.conf.in b/bin/tests/system/wildcard/ns3/named.conf.in
index ad908a4cc78088887ba9fbff4ff615b6ae7ad773..cb0d38fcb9b7e36020a1e57d032dfe236ec21be2 100644 (file)
--- a/bin/tests/system/wildcard/ns3/named.conf.in
+++ b/bin/tests/system/wildcard/ns3/named.conf.in
@@ -23,4 +23,7 @@ options {
 
 include "../ns1/trusted.conf";
 
-zone "." { type hint; file "hints"; };
+zone "." {
+       type hint;
+       file "../../common/root.hint";
+};

diff --git a/bin/tests/system/wildcard/ns5/hints b/bin/tests/system/wildcard/ns5/hints
deleted file mode 100644 (file)
index b4b8f7a..0000000
--- a/bin/tests/system/wildcard/ns5/hints
+++ /dev/null
@@ -1,11 +0,0 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-;
-; 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 http://mozilla.org/MPL/2.0/.
-;
-; See the COPYRIGHT file distributed with this work for additional
-; information regarding copyright ownership.
-
-. 0 NS ns.root-servers.nil.
-ns.root-servers.nil. 0 A 10.53.0.1

diff --git a/bin/tests/system/wildcard/ns5/named.conf.in b/bin/tests/system/wildcard/ns5/named.conf.in
index 9ef24c73ea621ee7d33905a645dc8930a7f3cf31..012a032aafc901caf6f50ee7caf43d496aa853b6 100644 (file)
--- a/bin/tests/system/wildcard/ns5/named.conf.in
+++ b/bin/tests/system/wildcard/ns5/named.conf.in
@@ -24,4 +24,7 @@ options {
 
 include "../ns1/trusted.conf";
 
-zone "." { type hint; file "hints"; };
+zone "." {
+       type hint;
+       file "../../common/root.hint";
+};

diff --git a/util/copyrights b/util/copyrights
index d1451a873e460942ea71bbb14510727d1600e64d..68101f612ca271b2fa488d2bc9024d2e19bba433 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -2419,12 +2419,9 @@
 ./bin/tests/system/wildcard/ns1/private.nsec3.db.in    ZONE    2012,2013,2016,2018,2019
 ./bin/tests/system/wildcard/ns1/root.db.in     ZONE    2012,2013,2016,2018,2019
 ./bin/tests/system/wildcard/ns1/sign.sh                SH      2012,2013,2014,2016,2018,2019
-./bin/tests/system/wildcard/ns2/hints          ZONE    2012,2016,2018,2019
 ./bin/tests/system/wildcard/ns2/named.conf.in  CONF-C  2018,2019
-./bin/tests/system/wildcard/ns3/hints          ZONE    2012,2016,2018,2019
 ./bin/tests/system/wildcard/ns3/named.conf.in  CONF-C  2018,2019
 ./bin/tests/system/wildcard/ns4/named.conf.in  CONF-C  2018,2019
-./bin/tests/system/wildcard/ns5/hints          ZONE    2013,2016,2018,2019
 ./bin/tests/system/wildcard/ns5/named.conf.in  CONF-C  2018,2019
 ./bin/tests/system/wildcard/prereq.sh          SH      2014,2016,2018,2019
 ./bin/tests/system/wildcard/setup.sh           SH      2012,2014,2016,2018,2019