From: Evan Hunt <each@isc.org>
Date: Fri, 17 Jan 2014 01:11:28 +0000 (-0800)
Subject: [v9_6] fix config error
X-Git-Tag: v9.6-ESV-R11rc2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47eb8cba652d622d5fd650aceefaaf7511422940;p=thirdparty%2Fbind9.git

[v9_6] fix config error
---

diff --git a/bin/tests/system/emptyzones/ns1/named1.conf b/bin/tests/system/emptyzones/ns1/named1.conf
index 6f54ad24c77..1b7f04f3419 100644
--- a/bin/tests/system/emptyzones/ns1/named1.conf
+++ b/bin/tests/system/emptyzones/ns1/named1.conf
@@ -27,20 +27,15 @@ controls {
 };
 
 options {
-	query-source address 10.53.0.1 dscp 1;
-	notify-source 10.53.0.1 dscp 2;
-	transfer-source 10.53.0.1 dscp 3;
+	query-source address 10.53.0.1;
+	notify-source 10.53.0.1;
+	transfer-source 10.53.0.1;
 	port 5300;
 	pid-file "named.pid";
 	listen-on { 10.53.0.1; };
 	listen-on-v6 { none; };
 	recursion yes;
 	acache-enable yes;
-	deny-answer-addresses { 192.0.2.0/24; 2001:db8:beef::/48; }
-		 except-from { "example.org"; };
-	deny-answer-aliases { "example.org"; }
-		except-from { "goodcname.example.net";
-			      "gooddname.example.net"; };
 	allow-query {!10.53.0.8; any; };
 };
 
diff --git a/bin/tests/system/emptyzones/ns1/named2.conf b/bin/tests/system/emptyzones/ns1/named2.conf
index 467511ca220..45a2b73ad6c 100644
--- a/bin/tests/system/emptyzones/ns1/named2.conf
+++ b/bin/tests/system/emptyzones/ns1/named2.conf
@@ -27,20 +27,15 @@ controls {
 };
 
 options {
-	query-source address 10.53.0.1 dscp 1;
-	notify-source 10.53.0.1 dscp 2;
-	transfer-source 10.53.0.1 dscp 3;
+	query-source address 10.53.0.1;
+	notify-source 10.53.0.1;
+	transfer-source 10.53.0.1;
 	port 5300;
 	pid-file "named.pid";
 	listen-on { 10.53.0.1; };
 	listen-on-v6 { none; };
 	recursion yes;
 	acache-enable yes;
-	deny-answer-addresses { 192.0.2.0/24; 2001:db8:beef::/48; }
-		 except-from { "example.org"; };
-	deny-answer-aliases { "example.org"; }
-		except-from { "goodcname.example.net";
-			      "gooddname.example.net"; };
 	allow-query {!10.53.0.8; any; };
 };