From: Mark Andrews <marka@isc.org>
Date: Thu, 26 Jul 2012 06:20:47 +0000 (+1000)
Subject: tailor for 9.7
X-Git-Tag: v9.7.7rc1~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fad0b17f50ccb3f89dc94bf8acd1d596c2fbb04a;p=thirdparty%2Fbind9.git

tailor for 9.7
---

diff --git a/bin/tests/system/dnssec/ns4/named3.conf b/bin/tests/system/dnssec/ns4/named3.conf
index 2d407407dca..b8bfb6cb2db 100644
--- a/bin/tests/system/dnssec/ns4/named3.conf
+++ b/bin/tests/system/dnssec/ns4/named3.conf
@@ -31,9 +31,8 @@ options {
 	recursion yes;
 	acache-enable yes;
 	dnssec-enable yes;
-	dnssec-validation auto;
-        bindkeys-file "managed.conf";
-        dnssec-accept-expired yes;
+	dnssec-validation yes;
+	dnssec-accept-expired yes;
 };
 
 key rndc_key {
@@ -49,3 +48,5 @@ zone "." {
 	type hint;
 	file "../../common/root.hint";
 };
+
+include "managed.conf";