From: Mark Andrews <marka@isc.org>
Date: Thu, 29 Oct 2015 01:51:17 +0000 (+1100)
Subject: 4244.   [bug]           The parser was not reporting that use-ixfr is obsolete.
X-Git-Tag: v9.11.0a1~327^2~34
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=72ac929f2bfe186ab4fe2d9425685d6ef419f200;p=thirdparty%2Fbind9.git

4244.   [bug]           The parser was not reporting that use-ixfr is obsolete.
                        [RT #41010]
---

diff --git a/CHANGES b/CHANGES
index d85e8742579..df81898c916 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4244.	[bug]		The parser was not reporting that use-ixfr is obsolete.
+			[RT #41010]
+
 4243.	[func]		Improved stats reporting from Timothe Litt. [RT #38941]
 
 4242.	[bug]		Replace the client if not already replaced when
diff --git a/bin/named/config.c b/bin/named/config.c
index c5d5e23c292..a0ee4822615 100644
--- a/bin/named/config.c
+++ b/bin/named/config.c
@@ -118,7 +118,7 @@ options {\n\
 	transfers-out 10;\n\
 #	treat-cr-as-space <obsolete>;\n\
 #	use-id-pool <obsolete>;\n\
-	use-ixfr true;\n\
+#	use-ixfr <obsolete>;\n\
 	edns-udp-size 4096;\n\
 	max-udp-size 4096;\n\
 	nocookie-udp-size 4096;\n\
diff --git a/bin/named/named.conf.docbook b/bin/named/named.conf.docbook
index a47e2c8f461..a6a31070ed5 100644
--- a/bin/named/named.conf.docbook
+++ b/bin/named/named.conf.docbook
@@ -240,7 +240,6 @@ options {
 	transfers-per-ns <replaceable>integer</replaceable>;
 	transfers-in <replaceable>integer</replaceable>;
 	transfers-out <replaceable>integer</replaceable>;
-	use-ixfr <replaceable>boolean</replaceable>;
 	version ( <replaceable>quoted_string</replaceable> | none );
 	allow-recursion { <replaceable>address_match_element</replaceable>; ... };
 	allow-recursion-on { <replaceable>address_match_element</replaceable>; ... };
@@ -408,6 +407,7 @@ options {
 	serial-queries <replaceable>integer</replaceable>; // obsolete
 	treat-cr-as-space <replaceable>boolean</replaceable>; // obsolete
 	use-id-pool <replaceable>boolean</replaceable>; // obsolete
+	use-ixfr <replaceable>boolean</replaceable>; // obsolete
 };
 </literallayout>
   </refsection>
diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index 86c47f5ab5d..8ac0a4cba12 100644
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -1090,7 +1090,7 @@ options_clauses[] = {
 	{ "transfers-out", &cfg_type_uint32, 0 },
 	{ "treat-cr-as-space", &cfg_type_boolean, CFG_CLAUSEFLAG_OBSOLETE },
 	{ "use-id-pool", &cfg_type_boolean, CFG_CLAUSEFLAG_OBSOLETE },
-	{ "use-ixfr", &cfg_type_boolean, 0 },
+	{ "use-ixfr", &cfg_type_boolean, CFG_CLAUSEFLAG_OBSOLETE },
 	{ "use-v4-udp-ports", &cfg_type_bracketed_portlist, 0 },
 	{ "use-v6-udp-ports", &cfg_type_bracketed_portlist, 0 },
 	{ "version", &cfg_type_qstringornone, 0 },