diff --git a/CHANGES b/CHANGES index 39a69a9772..08b3b92b7a 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +4244. [bug] The parser was not reporting that use-ixfr is obsolete. + [RT #41010] + 4241. [doc] Improved the TSIG, TKEY, and SIG(0) sections in the ARM. [RT #40955] diff --git a/bin/named/config.c b/bin/named/config.c index cab6f1fd0d..4798272ac3 100644 --- a/bin/named/config.c +++ b/bin/named/config.c @@ -103,9 +103,9 @@ options {\n\ transfers-per-ns 2;\n\ transfers-in 10;\n\ transfers-out 10;\n\ - treat-cr-as-space true;\n\ - use-id-pool true;\n\ - use-ixfr true;\n\ +# treat-cr-as-space ;\n\ +# use-id-pool ;\n\ +# use-ixfr ;\n\ edns-udp-size 4096;\n\ max-udp-size 4096;\n\ request-nsid false;\n\ diff --git a/bin/named/named.conf.docbook b/bin/named/named.conf.docbook index 65a5cf0a5f..01cb62aaa0 100644 --- a/bin/named/named.conf.docbook +++ b/bin/named/named.conf.docbook @@ -235,7 +235,6 @@ options { transfers-per-ns integer; transfers-in integer; transfers-out integer; - use-ixfr boolean; version ( quoted_string | none ); allow-recursion { address_match_element; ... }; allow-recursion-on { address_match_element; ... }; @@ -395,6 +394,7 @@ options { serial-queries integer; // obsolete treat-cr-as-space boolean; // obsolete use-id-pool boolean; // obsolete + use-ixfr boolean; // obsolete }; diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c index 3235d26bb3..d95a03a614 100644 --- a/lib/isccfg/namedconf.c +++ b/lib/isccfg/namedconf.c @@ -1008,7 +1008,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 },