upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-10 18:00:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
[RT #41010]
This commit is contained in:
Mark Andrews 2015-10-29 12:51:17 +11:00
parent 8cbf7ab243
commit 73cf46fdad
4 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -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]

6
bin/named/config.c
View file

@ -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 <obsolete>;\n\
# use-id-pool <obsolete>;\n\
# use-ixfr <obsolete>;\n\
edns-udp-size 4096;\n\
max-udp-size 4096;\n\
request-nsid false;\n\

2
bin/named/named.conf.docbook
View file

@ -235,7 +235,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>; ... };
@ -395,6 +394,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>

2
lib/isccfg/namedconf.c
View file

@ -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 },