From 30f4bdb17e63d1b30e4a52425e704f33944e86fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Thu, 27 Jan 2022 10:13:10 +0100 Subject: [PATCH] Declare the keep-response-order obsolete The keep-response-order option has been introduced when TCP pipelining has been introduced to BIND 9 as a failsafe for possibly non-compliant clients. Declare the keep-response-order obsolete as all DNS clients should either support out-of-order processing or don't send more DNS queries until the DNS response for the previous one has been received. --- bin/named/config.c | 1 - bin/named/named.conf.rst | 1 - bin/tests/system/pipelined/ns4/named.conf.in | 1 - doc/arm/reference.rst | 10 ++-------- doc/man/named.conf.5in | 1 - doc/misc/options | 2 +- doc/misc/options.active | 1 - doc/misc/options.grammar.rst | 1 - lib/isccfg/namedconf.c | 3 ++- 9 files changed, 5 insertions(+), 16 deletions(-) diff --git a/bin/named/config.c b/bin/named/config.c index 1860e239ed..e11163834d 100644 --- a/bin/named/config.c +++ b/bin/named/config.c @@ -68,7 +68,6 @@ options {\n\ "\ heartbeat-interval 60;\n\ interface-interval 60;\n\ -# keep-response-order {none;};\n\ listen-on {any;};\n\ listen-on-v6 {any;};\n\ # lock-file \"" NAMED_LOCALSTATEDIR "/run/named/named.lock\";\n\ diff --git a/bin/named/named.conf.rst b/bin/named/named.conf.rst index def862f844..d361babb55 100644 --- a/bin/named/named.conf.rst +++ b/bin/named/named.conf.rst @@ -301,7 +301,6 @@ OPTIONS ipv4only-server string; ixfr-from-differences ( primary | master | secondary | slave | boolean ); - keep-response-order { address_match_element; ... }; key-directory quoted_string; lame-ttl duration; listen-on [ port integer ] [ dscp diff --git a/bin/tests/system/pipelined/ns4/named.conf.in b/bin/tests/system/pipelined/ns4/named.conf.in index 922cebda3c..cfd0fd213c 100644 --- a/bin/tests/system/pipelined/ns4/named.conf.in +++ b/bin/tests/system/pipelined/ns4/named.conf.in @@ -20,7 +20,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.4; }; listen-on-v6 { none; }; - keep-response-order { 10.53.0.7/32; }; recursion yes; dnssec-validation yes; notify yes; diff --git a/doc/arm/reference.rst b/doc/arm/reference.rst index fe370dcf10..b9d1145e54 100644 --- a/doc/arm/reference.rst +++ b/doc/arm/reference.rst @@ -153,8 +153,8 @@ and a negated match denies access. If there is no match, access is denied. The clauses ``allow-notify``, ``allow-recursion``, ``allow-recursion-on``, ``allow-query``, ``allow-query-on``, ``allow-query-cache``, ``allow-query-cache-on``, ``allow-transfer``, -``allow-update``, ``allow-update-forwarding``, ``blackhole``, and -``keep-response-order`` all use address match lists. Similarly, the +``allow-update``, ``allow-update-forwarding``, and ``blackhole`` +all use address match lists. Similarly, the ``listen-on`` option causes the server to refuse queries on any of the machine's addresses which do not match the list. @@ -2463,12 +2463,6 @@ for details on how to specify IP address lists. from or use to resolve a query. Queries from these addresses are not responded to. The default is ``none``. -``keep-response-order`` - This specifies a list of addresses to which the server sends responses - to TCP queries, in the same order in which they were received. This - disables the processing of TCP queries in parallel. The default is - ``none``. - ``no-case-compress`` This specifies a list of addresses which require responses to use case-insensitive compression. This ACL can be used when ``named`` diff --git a/doc/man/named.conf.5in b/doc/man/named.conf.5in index 246c396aa3..dcc48ec42a 100644 --- a/doc/man/named.conf.5in +++ b/doc/man/named.conf.5in @@ -357,7 +357,6 @@ options { ipv4only\-server string; ixfr\-from\-differences ( primary | master | secondary | slave | boolean ); - keep\-response\-order { address_match_element; ... }; key\-directory quoted_string; lame\-ttl duration; listen\-on [ port integer ] [ dscp diff --git a/doc/misc/options b/doc/misc/options index b62967ef0c..3a8730c3ac 100644 --- a/doc/misc/options +++ b/doc/misc/options @@ -214,7 +214,7 @@ options { ipv4only-server ; ixfr-from-differences ( primary | master | secondary | slave | ); - keep-response-order { ; ... }; + keep-response-order { ; ... }; // obsolete key-directory ; lame-ttl ; listen-on [ port ] [ dscp diff --git a/doc/misc/options.active b/doc/misc/options.active index a3e2fbe3f0..8c97c2d97c 100644 --- a/doc/misc/options.active +++ b/doc/misc/options.active @@ -213,7 +213,6 @@ options { ipv4only-server ; ixfr-from-differences ( primary | master | secondary | slave | ); - keep-response-order { ; ... }; key-directory ; lame-ttl ; listen-on [ port ] [ dscp diff --git a/doc/misc/options.grammar.rst b/doc/misc/options.grammar.rst index b6dc89ca0c..c03505f2e9 100644 --- a/doc/misc/options.grammar.rst +++ b/doc/misc/options.grammar.rst @@ -144,7 +144,6 @@ ipv4only-server ; ixfr-from-differences ( primary | master | secondary | slave | ); - keep-response-order { ; ... }; key-directory ; lame-ttl ; listen-on [ port ] [ dscp diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c index f88b1466dd..83cc600376 100644 --- a/lib/isccfg/namedconf.c +++ b/lib/isccfg/namedconf.c @@ -1274,7 +1274,8 @@ static cfg_clausedef_t options_clauses[] = { { "host-statistics-max", NULL, CFG_CLAUSEFLAG_ANCIENT }, { "hostname", &cfg_type_qstringornone, 0 }, { "interface-interval", &cfg_type_duration, 0 }, - { "keep-response-order", &cfg_type_bracketed_aml, 0 }, + { "keep-response-order", &cfg_type_bracketed_aml, + CFG_CLAUSEFLAG_OBSOLETE }, { "listen-on", &cfg_type_listenon, CFG_CLAUSEFLAG_MULTI }, { "listen-on-v6", &cfg_type_listenon, CFG_CLAUSEFLAG_MULTI }, { "lock-file", &cfg_type_qstringornone, 0 },