From: Michał Kępień <michal@isc.org>
Date: Wed, 31 Jul 2019 09:06:34 +0000 (+0200)
Subject: Make root hints consistent with authoritative data
X-Git-Tag: v9.15.3~18^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd430c309311c727928b9160b8a04dc6381ca318;p=thirdparty%2Fbind9.git

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
index b4b8f7ab532..00000000000
--- 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 3a32a159561..8ae001b5a13 100644
--- 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
index b4b8f7ab532..00000000000
--- 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 879d08f70ca..0b3ec8b63be 100644
--- 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
index b4b8f7ab532..00000000000
--- 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 efe63a70307..c54ed2ea19e 100644
--- 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";
+};