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.

diff --git a/bin/named/config.c b/bin/named/config.c
index 1860e239ed2868034e816ba5d87fe84155332bff..e11163834d5caa504b7a9a26ede2e39a56ceabea 100644 (file)
--- 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 def862f844e1cb656d4f6efb4b8e77d70d17438a..d361babb55fed73fd57ac9ba03d019a9b1b63c58 100644 (file)
--- 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 922cebda3c3ebd114bfeabe3605ffcc6c087bda2..cfd0fd213c57a85e1fd6db56a655e0d1988fdd90 100644 (file)
--- 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 fe370dcf102e37a84bc0636cb4e6473a843ab3cc..b9d1145e542c100f8e131e49fc035cafbc22a63c 100644 (file)
--- 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 246c396aa33ca340c4c62fb564b2feb5407cd60f..dcc48ec42a4e041a63e5f51daea194de9b9d8d7a 100644 (file)
--- 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 b62967ef0c60f5f72a55aadb9ce4ad691373997e..3a8730c3acad4239284e9297ce373b773fcb9a75 100644 (file)
--- a/doc/misc/options
+++ b/doc/misc/options
@@ -214,7 +214,7 @@ options {
         ipv4only-server <string>;
         ixfr-from-differences ( primary | master | secondary | slave |
             <boolean> );
-        keep-response-order { <address_match_element>; ... };
+        keep-response-order { <address_match_element>; ... }; // obsolete
         key-directory <quoted_string>;
         lame-ttl <duration>;
         listen-on [ port <integer> ] [ dscp

diff --git a/doc/misc/options.active b/doc/misc/options.active
index a3e2fbe3f0e7232e7b56a88bd3cbb880425d4335..8c97c2d97c111490ee24c7123a5f67bef8953fc8 100644 (file)
--- a/doc/misc/options.active
+++ b/doc/misc/options.active
@@ -213,7 +213,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.grammar.rst b/doc/misc/options.grammar.rst
index b6dc89ca0cfa62a2ab9245b9a1bc9e09456b4a1d..c03505f2e9098e59dda0226dd2479f524c07ec2a 100644 (file)
--- a/doc/misc/options.grammar.rst
+++ b/doc/misc/options.grammar.rst
@@ -144,7 +144,6 @@
        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/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index f88b1466dd21f01b46aca59bfea669679e83b019..83cc6003765ddbfc6080b3da2dbb69af6927abff 100644 (file)
--- 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 },