Obsolete the "glue-cache" option

The "glue-cache" option was marked as deprecated by commit
5ae33351f286feb25a965bf3c9e6b122ab495342 (first released in BIND 9.17.6,
back in October 2020), so now obsolete that option, removing all code
and documentation related to it.

Note: this causes the glue cache feature to be permanently enabled, not
disabled.

diff --git a/bin/named/config.c b/bin/named/config.c
index f7cc14dbafa15c19248eb628509d21376c3bba7a..83e8bd39fc09b4af432db8eefa65d9e879f6d58a 100644 (file)
--- a/bin/named/config.c
+++ b/bin/named/config.c
@@ -162,7 +162,6 @@ options {\n\
        fetch-quota-params 100 0.1 0.3 0.7;\n\
        fetches-per-server 0;\n\
        fetches-per-zone 0;\n\
-       glue-cache yes;\n\
        lame-ttl 0;\n"
 #ifdef HAVE_LMDB
                            "   lmdb-mapsize 32M;\n"

diff --git a/bin/named/named.conf.rst b/bin/named/named.conf.rst
index c5afdcfdddf9b6b10050ab3a421c8fa212c07fb2..15ebf8759502ae3ce508adf972d995fdbc6fe36a 100644 (file)
--- a/bin/named/named.conf.rst
+++ b/bin/named/named.conf.rst
@@ -276,7 +276,6 @@ OPTIONS
        fstrm-set-output-queue-size integer;
        fstrm-set-reopen-interval duration;
        geoip-directory ( quoted_string | none );
-       glue-cache boolean;// deprecated
        heartbeat-interval integer;
        hostname ( quoted_string | none );
        http-listener-clients integer;
@@ -693,7 +692,6 @@ VIEW
        forward ( first | only );
        forwarders [ port integer ] [ dscp integer ] { ( ipv4_address
            | ipv6_address ) [ port integer ] [ dscp integer ]; ... };
-       glue-cache boolean;// deprecated
        ipv4only-contact string;
        ipv4only-enable boolean;
        ipv4only-server string;

diff --git a/bin/named/server.c b/bin/named/server.c
index a8ba34457a2e228cf8ec649f83e24b7e95b3c017..81f724abf489454bfd45a9871296f1aeb7fb79c5 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -5187,12 +5187,6 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config,
        INSIST(result == ISC_R_SUCCESS);
        view->auth_nxdomain = cfg_obj_asboolean(obj);
 
-       /* deprecated */
-       obj = NULL;
-       result = named_config_get(maps, "glue-cache", &obj);
-       INSIST(result == ISC_R_SUCCESS);
-       view->use_glue_cache = cfg_obj_asboolean(obj);
-
        obj = NULL;
        result = named_config_get(maps, "minimal-any", &obj);
        INSIST(result == ISC_R_SUCCESS);

diff --git a/bin/tests/system/checkconf/bad-glue-cache-bogus.conf b/bin/tests/system/checkconf/bad-glue-cache-bogus.conf
deleted file mode 100644 (file)
index c264b26..0000000
--- a/bin/tests/system/checkconf/bad-glue-cache-bogus.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * SPDX-License-Identifier: MPL-2.0
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0.  If a copy of the MPL was not distributed with this
- * file, you can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
- */
-
-options {
-       glue-cache bogusvalue;
-};

diff --git a/bin/tests/system/checkconf/good-glue-cache.conf b/bin/tests/system/checkconf/good-glue-cache.conf
deleted file mode 100644 (file)
index fd5524b..0000000
--- a/bin/tests/system/checkconf/good-glue-cache.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * SPDX-License-Identifier: MPL-2.0
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0.  If a copy of the MPL was not distributed with this
- * file, you can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
- */
-
-options {
-       glue-cache yes;
-};

diff --git a/doc/arm/reference.rst b/doc/arm/reference.rst
index abd39be914df4b9b08f6b7385a3a90a98e26efff..01d76a3e86ce01866a74340fb542ff3350b2fa16 100644 (file)
--- a/doc/arm/reference.rst
+++ b/doc/arm/reference.rst
@@ -2030,20 +2030,6 @@ Boolean Options
 
    The default is ``no-auth-recursive``.
 
-.. namedconf:statement:: glue-cache
-
-   When set to ``yes``, a cache is used to improve query performance
-   when adding address-type (A and AAAA) glue records to the additional
-   section of DNS response messages that delegate to a child zone.
-
-   The glue cache uses memory proportional to the number of delegations
-   in the zone. The default setting is ``yes``, which improves
-   performance at the cost of increased memory usage for the zone. To avoid
-   this, set it to ``no``.
-
-   .. note:: This option is deprecated and its use is discouraged. The
-      glue cache will be permanently *enabled* in a future release.
-
 .. namedconf:statement:: minimal-any
 
    If set to ``yes``, the server replies with only one of

diff --git a/doc/man/named.conf.5in b/doc/man/named.conf.5in
index 7cff755038f26c1a59119c6704c8c63aab5f9dbc..c05335d99270b806d61a221257674775bd453ed8 100644 (file)
--- a/doc/man/named.conf.5in
+++ b/doc/man/named.conf.5in
@@ -326,7 +326,6 @@ options {
       fstrm\-set\-output\-queue\-size integer;
       fstrm\-set\-reopen\-interval duration;
       geoip\-directory ( quoted_string | none );
-      glue\-cache boolean;// deprecated
       heartbeat\-interval integer;
       hostname ( quoted_string | none );
       http\-listener\-clients integer;
@@ -779,7 +778,6 @@ view string [ class ] {
       forward ( first | only );
       forwarders [ port integer ] [ dscp integer ] { ( ipv4_address
           | ipv6_address ) [ port integer ] [ dscp integer ]; ... };
-      glue\-cache boolean;// deprecated
       ipv4only\-contact string;
       ipv4only\-enable boolean;
       ipv4only\-server string;

diff --git a/doc/misc/options b/doc/misc/options
index e749d468e801fdd143b1f20207e1ab2d6023460d..bffd4e7a905d3c765083dc6b96284203b5dc1ac5 100644 (file)
--- a/doc/misc/options
+++ b/doc/misc/options
@@ -192,7 +192,6 @@ options {
         fstrm-set-output-queue-size <integer>;
         fstrm-set-reopen-interval <duration>;
         geoip-directory ( <quoted_string> | none );
-        glue-cache <boolean>; // deprecated
         heartbeat-interval <integer>;
         hostname ( <quoted_string> | none );
         http-listener-clients <integer>;
@@ -565,7 +564,6 @@ view <string> [ <class> ] {
         forward ( first | only );
         forwarders [ port <integer> ] [ dscp <integer> ] { ( <ipv4_address>
             | <ipv6_address> ) [ port <integer> ] [ dscp <integer> ]; ... };
-        glue-cache <boolean>; // deprecated
         ipv4only-contact <string>;
         ipv4only-enable <boolean>;
         ipv4only-server <string>;

diff --git a/doc/misc/options.active b/doc/misc/options.active
index ae884458691a918bc645bf04feab1a2cf9fc35dd..cedb810e391ce3dc135e4fef88a710686d6d394e 100644 (file)
--- a/doc/misc/options.active
+++ b/doc/misc/options.active
@@ -191,7 +191,6 @@ options {
         fstrm-set-output-queue-size <integer>;
         fstrm-set-reopen-interval <duration>;
         geoip-directory ( <quoted_string> | none );
-        glue-cache <boolean>; // deprecated
         heartbeat-interval <integer>;
         hostname ( <quoted_string> | none );
         http-listener-clients <integer>;
@@ -561,7 +560,6 @@ view <string> [ <class> ] {
         forward ( first | only );
         forwarders [ port <integer> ] [ dscp <integer> ] { ( <ipv4_address>
             | <ipv6_address> ) [ port <integer> ] [ dscp <integer> ]; ... };
-        glue-cache <boolean>; // deprecated
         ipv4only-contact <string>;
         ipv4only-enable <boolean>;
         ipv4only-server <string>;

diff --git a/doc/misc/options.grammar.rst b/doc/misc/options.grammar.rst
index 155a27b92a11976464ea9638ab9db6d5238da6a2..d0e8eeea3ad4da35981cdc031c2edfd300eef154 100644 (file)
--- a/doc/misc/options.grammar.rst
+++ b/doc/misc/options.grammar.rst
@@ -128,7 +128,6 @@
        fstrm-set-output-queue-size <integer>;
        fstrm-set-reopen-interval <duration>;
        geoip-directory ( <quoted_string> | none );
-       glue-cache <boolean>; // deprecated
        heartbeat-interval <integer>;
        hostname ( <quoted_string> | none );
        http-listener-clients <integer>;

diff --git a/lib/dns/include/dns/view.h b/lib/dns/include/dns/view.h
index c9cd3b61d7682471f6e1342b90c269ad2e9da6f8..721ac5e60a7c7b584c13f5732e1a0d25f8e6ec93 100644 (file)
--- a/lib/dns/include/dns/view.h
+++ b/lib/dns/include/dns/view.h
@@ -117,7 +117,6 @@ struct dns_view {
        bool                  qminimization;
        bool                  qmin_strict;
        bool                  auth_nxdomain;
-       bool                  use_glue_cache;
        bool                  minimal_any;
        dns_minimaltype_t     minimalresponses;
        bool                  enablevalidation;

diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index 7a7e041a4d70c8c592fe114a29009ba2fc41ed0b..a438fe1f5e61b55ead51148849c5f05f86774861 100644 (file)
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -2080,7 +2080,7 @@ static cfg_clausedef_t view_clauses[] = {
        { "filter-aaaa", &cfg_type_bracketed_aml, CFG_CLAUSEFLAG_ANCIENT },
        { "filter-aaaa-on-v4", &cfg_type_boolean, CFG_CLAUSEFLAG_ANCIENT },
        { "filter-aaaa-on-v6", &cfg_type_boolean, CFG_CLAUSEFLAG_ANCIENT },
-       { "glue-cache", &cfg_type_boolean, CFG_CLAUSEFLAG_DEPRECATED },
+       { "glue-cache", &cfg_type_boolean, CFG_CLAUSEFLAG_ANCIENT },
        { "ipv4only-enable", &cfg_type_boolean, 0 },
        { "ipv4only-contact", &cfg_type_astring, 0 },
        { "ipv4only-server", &cfg_type_astring, 0 },

diff --git a/lib/ns/query.c b/lib/ns/query.c
index 8ce90668f590799b9bd08f2519db4a181e3115b9..c7624290b0d8009797f3a661617992d74861bb1b 100644 (file)
--- a/lib/ns/query.c
+++ b/lib/ns/query.c
@@ -2099,10 +2099,8 @@ query_additional(query_ctx_t *qctx, dns_name_t *name,
        /*
         * Try to process glue directly.
         */
-       if (qctx->view->use_glue_cache &&
-           (rdataset->type == dns_rdatatype_ns) &&
-           (client->query.gluedb != NULL) &&
-           dns_db_iszone(client->query.gluedb))
+       if (rdataset->type == dns_rdatatype_ns &&
+           client->query.gluedb != NULL && dns_db_iszone(client->query.gluedb))
        {
                ns_dbversion_t *dbversion;