Deprecate the "glue-cache" option

No issues with the glue cache feature have been reported since its
introduction in BIND 9.12.  As the rationale for introducing the
"glue-cache" option was to have a safety switch readily available in
case the glue cache turns out to cause problems, it is time to deprecate
the option.  Glue cache will be permanently enabled in a future release,
at which point the "glue-cache" option will be made obsolete.

diff --git a/bin/named/named.conf.rst b/bin/named/named.conf.rst
index fe109031fc90c21ee2dd09a85f2776900218a721..25ee17cc4818e3a3f3e98600a67af6066a01f54f 100644 (file)
--- a/bin/named/named.conf.rst
+++ b/bin/named/named.conf.rst
@@ -257,7 +257,7 @@ OPTIONS
        fstrm-set-output-queue-size integer;
        fstrm-set-reopen-interval duration;
        geoip-directory ( quoted_string | none );
-       glue-cache boolean;
+       glue-cache boolean;// deprecated
        heartbeat-interval integer;
        hostname ( quoted_string | none );
        inline-signing boolean;
@@ -624,7 +624,7 @@ VIEW
        forward ( first | only );
        forwarders [ port integer ] [ dscp integer ] { ( ipv4_address
            | ipv6_address ) [ port integer ] [ dscp integer ]; ... };
-       glue-cache boolean;
+       glue-cache boolean;// deprecated
        inline-signing boolean;
        ixfr-from-differences ( primary | master | secondary | slave |
            boolean );

diff --git a/bin/named/server.c b/bin/named/server.c
index e3bcfac23e99080d6ffcc99f95e59736a5f37e5a..13c48a5bd4d9192b2541ea8a03809034d24557f4 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -4970,6 +4970,7 @@ 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);

diff --git a/bin/tests/system/statistics/ns3/named.conf.in b/bin/tests/system/statistics/ns3/named.conf.in
index 543110de2289c84e248c3e021a56d1e312c475e7..7e4ac0631157c1c4890e3a5e36eaa964270af219 100644 (file)
--- a/bin/tests/system/statistics/ns3/named.conf.in
+++ b/bin/tests/system/statistics/ns3/named.conf.in
@@ -23,7 +23,6 @@ options {
        notify yes;
        qname-minimization disabled;
        zone-statistics yes;
-       glue-cache yes;
 };
 
 statistics-channels {

diff --git a/doc/arm/reference.rst b/doc/arm/reference.rst
index 463744b28cb1c0524fc154ea33bb08cc26313302..093abd607f168434bba36b3205b406ce6450c742 100644 (file)
--- a/doc/arm/reference.rst
+++ b/doc/arm/reference.rst
@@ -1710,6 +1710,9 @@ Boolean Options
    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.
+
 ``minimal-any``
    If set to ``yes``, the server replies with only one of
    the RRsets for the query name, and its covering RRSIGs if any,

diff --git a/doc/man/named.conf.5in b/doc/man/named.conf.5in
index a5b954fdf6807d8819064ddab2a88f4a0adc58bc..cbad85bf4cacc3ae9aa489984b31ceacdd65179e 100644 (file)
--- a/doc/man/named.conf.5in
+++ b/doc/man/named.conf.5in
@@ -320,7 +320,7 @@ options {
       fstrm\-set\-output\-queue\-size integer;
       fstrm\-set\-reopen\-interval duration;
       geoip\-directory ( quoted_string | none );
-      glue\-cache boolean;
+      glue\-cache boolean;// deprecated
       heartbeat\-interval integer;
       hostname ( quoted_string | none );
       inline\-signing boolean;
@@ -715,7 +715,7 @@ view string [ class ] {
       forward ( first | only );
       forwarders [ port integer ] [ dscp integer ] { ( ipv4_address
           | ipv6_address ) [ port integer ] [ dscp integer ]; ... };
-      glue\-cache boolean;
+      glue\-cache boolean;// deprecated
       inline\-signing boolean;
       ixfr\-from\-differences ( primary | master | secondary | slave |
           boolean );

diff --git a/doc/misc/named.conf.rst b/doc/misc/named.conf.rst
index e7725b9d917fded30fe1a523e1f30c4c86a7ec84..2b911e782d201736a84b85b88ee24e08f5708cb4 100644 (file)
--- a/doc/misc/named.conf.rst
+++ b/doc/misc/named.conf.rst
@@ -270,7 +270,7 @@ OPTIONS
        fstrm-set-output-queue-size integer;
        fstrm-set-reopen-interval duration;
        geoip-directory ( quoted_string | none );
-       glue-cache boolean;
+       glue-cache boolean;, deprecated
        heartbeat-interval integer;
        hostname ( quoted_string | none );
        inline-signing boolean;
@@ -627,7 +627,7 @@ VIEW
        forward ( first | only );
        forwarders [ port integer ] [ dscp integer ] { ( ipv4_address
            | ipv6_address ) [ port integer ] [ dscp integer ]; ... };
-       glue-cache boolean;
+       glue-cache boolean;, deprecated
        inline-signing boolean;
        ixfr-from-differences ( primary | master | secondary | slave |
            boolean );

diff --git a/doc/misc/options b/doc/misc/options
index 39b9e91374ac59dc438a17b84967a5463e2133e2..ef4654c84b22706c88e46971f30ce9cdea2cf9dc 100644 (file)
--- a/doc/misc/options
+++ b/doc/misc/options
@@ -205,7 +205,7 @@ options {
         fstrm-set-reopen-interval <duration>;
         geoip-directory ( <quoted_string> | none );
         geoip-use-ecs <boolean>; // obsolete
-        glue-cache <boolean>;
+        glue-cache <boolean>; // deprecated
         has-old-clients <boolean>; // ancient
         heartbeat-interval <integer>;
         host-statistics <boolean>; // ancient
@@ -575,7 +575,7 @@ view <string> [ <class> ] {
         forward ( first | only );
         forwarders [ port <integer> ] [ dscp <integer> ] { ( <ipv4_address>
             | <ipv6_address> ) [ port <integer> ] [ dscp <integer> ]; ... };
-        glue-cache <boolean>;
+        glue-cache <boolean>; // deprecated
         inline-signing <boolean>;
         ixfr-from-differences ( primary | master | secondary | slave |
             <boolean> );

diff --git a/doc/misc/options.active b/doc/misc/options.active
index 0b50d4cb99cfe98ccceeebd002d92d7d60ca003c..d58a7ff4f1342e5ee6e7b09934b9aaa1389d572f 100644 (file)
--- a/doc/misc/options.active
+++ b/doc/misc/options.active
@@ -185,7 +185,7 @@ options {
         fstrm-set-output-queue-size <integer>;
         fstrm-set-reopen-interval <duration>;
         geoip-directory ( <quoted_string> | none );
-        glue-cache <boolean>;
+        glue-cache <boolean>; // deprecated
         heartbeat-interval <integer>;
         hostname ( <quoted_string> | none );
         inline-signing <boolean>;
@@ -515,7 +515,7 @@ view <string> [ <class> ] {
         forward ( first | only );
         forwarders [ port <integer> ] [ dscp <integer> ] { ( <ipv4_address>
             | <ipv6_address> ) [ port <integer> ] [ dscp <integer> ]; ... };
-        glue-cache <boolean>;
+        glue-cache <boolean>; // deprecated
         inline-signing <boolean>;
         ixfr-from-differences ( primary | master | secondary | slave |
             <boolean> );

diff --git a/doc/misc/options.grammar.rst b/doc/misc/options.grammar.rst
index dffce2f4a676b4fbd1bfda9a6d95e357736795ac..5c1ea45f3ce8347926e164c57004e762f62a17b3 100644 (file)
--- a/doc/misc/options.grammar.rst
+++ b/doc/misc/options.grammar.rst
@@ -115,7 +115,7 @@
        fstrm-set-output-queue-size <integer>;
        fstrm-set-reopen-interval <duration>;
        geoip-directory ( <quoted_string> | none );
-       glue-cache <boolean>;
+       glue-cache <boolean>; // deprecated
        heartbeat-interval <integer>;
        hostname ( <quoted_string> | none );
        inline-signing <boolean>;

diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index fa01cdf41bf056913284ca3a05978beaa02b7364..87f8aaec6833276c7024d25da74365f2e40514ba 100644 (file)
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -1983,7 +1983,7 @@ static cfg_clausedef_t view_clauses[] = {
        { "filter-aaaa", &cfg_type_bracketed_aml, CFG_CLAUSEFLAG_OBSOLETE },
        { "filter-aaaa-on-v4", &cfg_type_boolean, CFG_CLAUSEFLAG_OBSOLETE },
        { "filter-aaaa-on-v6", &cfg_type_boolean, CFG_CLAUSEFLAG_OBSOLETE },
-       { "glue-cache", &cfg_type_boolean, 0 },
+       { "glue-cache", &cfg_type_boolean, CFG_CLAUSEFLAG_DEPRECATED },
        { "ixfr-from-differences", &cfg_type_ixfrdifftype, 0 },
        { "lame-ttl", &cfg_type_duration, 0 },
 #ifdef HAVE_LMDB