From 558ee243a6eb1e6f03e9d03287292c636582f47e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <michal@isc.org>
Date: Wed, 31 Jul 2019 11:06:34 +0200
Subject: [PATCH] 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)
---
 bin/tests/system/wildcard/ns2/hints         | 11 -----------
 bin/tests/system/wildcard/ns2/named.conf.in |  5 ++++-
 bin/tests/system/wildcard/ns3/hints         | 11 -----------
 bin/tests/system/wildcard/ns3/named.conf.in |  5 ++++-
 bin/tests/system/wildcard/ns5/hints         | 11 -----------
 bin/tests/system/wildcard/ns5/named.conf.in |  5 ++++-
 6 files changed, 12 insertions(+), 36 deletions(-)
 delete mode 100644 bin/tests/system/wildcard/ns2/hints
 delete mode 100644 bin/tests/system/wildcard/ns3/hints
 delete mode 100644 bin/tests/system/wildcard/ns5/hints

diff --git a/bin/tests/system/wildcard/ns2/hints b/bin/tests/system/wildcard/ns2/hints
deleted file mode 100644
index b4b8f7ab53..0000000000
--- 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 3a32a15956..8ae001b5a1 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 b4b8f7ab53..0000000000
--- 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 879d08f70c..0b3ec8b63b 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 b4b8f7ab53..0000000000
--- 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 efe63a7030..c54ed2ea19 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";
+};