From: Evan Hunt <each@isc.org>
Date: Sun, 11 Jul 2010 01:18:17 +0000 (+0000)
Subject: dnssec and dlv tests included master zones whose master files were missing.
X-Git-Tag: v9.7.1b1^2~18
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=542d079eb15edde06838f14616e1c0259857ed6e;p=thirdparty%2Fbind9.git

dnssec and dlv tests included master zones whose master files were missing.
this was a bug that hadn't been noticed before, but 19447 added a test for
that condition and it caused test failures.
---

diff --git a/bin/tests/system/dlv/ns6/named.conf b/bin/tests/system/dlv/ns6/named.conf
index 4bf0d7ac048..648ede0e16b 100644
--- a/bin/tests/system/dlv/ns6/named.conf
+++ b/bin/tests/system/dlv/ns6/named.conf
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.2.2.2 2010/05/27 23:49:55 tbox Exp $ */
+/* $Id: named.conf,v 1.2.2.3 2010/07/11 01:18:17 each Exp $ */
 
 controls { /* empty */ };
 
@@ -39,4 +39,4 @@ zone "grand.child5.utld" { type master; file "grand.child5.signed"; };
 zone "grand.child7.utld" { type master; file "grand.child7.signed"; };
 zone "grand.child8.utld" { type master; file "grand.child8.signed"; };
 zone "grand.child9.utld" { type master; file "grand.child9.signed"; };
-zone "grand.child10.utld" { type master; file "grand.child.db.in"; };
+zone "grand.child10.utld" { type master; file "grand.child10.signed"; };
diff --git a/bin/tests/system/dnssec/ns3/named.conf b/bin/tests/system/dnssec/ns3/named.conf
index 37193676328..86d69fa2e47 100644
--- a/bin/tests/system/dnssec/ns3/named.conf
+++ b/bin/tests/system/dnssec/ns3/named.conf
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.35.32.2 2010/01/18 23:48:01 tbox Exp $ */
+/* $Id: named.conf,v 1.35.32.3 2010/07/11 01:18:17 each Exp $ */
 
 // NS3
 
@@ -145,11 +145,6 @@ zone "multiple.example" {
 	allow-update { any; };
 };
 
-zone "mustbesecure.example" {
-	type master;
-	file "mustbesecure.example.db";
-};
-
 zone "rfc2335.example" {
 	type slave;
 	masters { 10.53.0.2; };