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.

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 3a32a15956166217aaab768c2162eefcc4510a6a..8ae001b5a13710dc774a48dc9ae08013a0b55da9 100644 (file)
--- a/bin/tests/system/wildcard/ns2/named.conf.in
+++ b/bin/tests/system/wildcard/ns2/named.conf.in
@@ -22,4 +22,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 879d08f70cae6115774dbbb3ca7898316fa1e82b..0b3ec8b63be7f6dfb81998e12a774634352d21a0 100644 (file)
--- a/bin/tests/system/wildcard/ns3/named.conf.in
+++ b/bin/tests/system/wildcard/ns3/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/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 efe63a703078d07a06787fe53e1f2443a56031ba..c54ed2ea19e5e2b2e24c08fa6dab846f63e076d1 100644 (file)
--- a/bin/tests/system/wildcard/ns5/named.conf.in
+++ b/bin/tests/system/wildcard/ns5/named.conf.in
@@ -25,4 +25,7 @@ options {
 
 include "../ns1/trusted.conf";
 
-zone "." { type hint; file "hints"; };
+zone "." {
+       type hint;
+       file "../../common/root.hint";
+};