diff --git a/CHANGES b/CHANGES index ba74a88f92..fd54ef6a01 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +5504. [func] The "glue-cache" option has been marked as deprecated. + The glue cache feature will be permanently enabled in a + future release. [GL #2146] + 5503. [bug] Cleaned up reference counting of network manager handles, now using isc_nmhandle_attach() and _detach() instead of _ref() and _unref(). [GL #2122] diff --git a/bin/named/named.conf.rst b/bin/named/named.conf.rst index fe109031fc..25ee17cc48 100644 --- 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 e3bcfac23e..13c48a5bd4 100644 --- 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 543110de22..7e4ac06311 100644 --- 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 463744b28c..093abd607f 100644 --- 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 a5b954fdf6..cbad85bf4c 100644 --- 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 e7725b9d91..2b911e782d 100644 --- 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 39b9e91374..ef4654c84b 100644 --- a/doc/misc/options +++ b/doc/misc/options @@ -205,7 +205,7 @@ options { fstrm-set-reopen-interval ; geoip-directory ( | none ); geoip-use-ecs ; // obsolete - glue-cache ; + glue-cache ; // deprecated has-old-clients ; // ancient heartbeat-interval ; host-statistics ; // ancient @@ -575,7 +575,7 @@ view [ ] { forward ( first | only ); forwarders [ port ] [ dscp ] { ( | ) [ port ] [ dscp ]; ... }; - glue-cache ; + glue-cache ; // deprecated inline-signing ; ixfr-from-differences ( primary | master | secondary | slave | ); diff --git a/doc/misc/options.active b/doc/misc/options.active index 0b50d4cb99..d58a7ff4f1 100644 --- a/doc/misc/options.active +++ b/doc/misc/options.active @@ -185,7 +185,7 @@ options { fstrm-set-output-queue-size ; fstrm-set-reopen-interval ; geoip-directory ( | none ); - glue-cache ; + glue-cache ; // deprecated heartbeat-interval ; hostname ( | none ); inline-signing ; @@ -515,7 +515,7 @@ view [ ] { forward ( first | only ); forwarders [ port ] [ dscp ] { ( | ) [ port ] [ dscp ]; ... }; - glue-cache ; + glue-cache ; // deprecated inline-signing ; ixfr-from-differences ( primary | master | secondary | slave | ); diff --git a/doc/misc/options.grammar.rst b/doc/misc/options.grammar.rst index dffce2f4a6..5c1ea45f3c 100644 --- a/doc/misc/options.grammar.rst +++ b/doc/misc/options.grammar.rst @@ -115,7 +115,7 @@ fstrm-set-output-queue-size ; fstrm-set-reopen-interval ; geoip-directory ( | none ); - glue-cache ; + glue-cache ; // deprecated heartbeat-interval ; hostname ( | none ); inline-signing ; diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst index 45adc8e4aa..f5e7f7ffd5 100644 --- a/doc/notes/notes-current.rst +++ b/doc/notes/notes-current.rst @@ -39,6 +39,10 @@ Removed Features now needs to be manually set in ``CFLAGS`` and ``-lprofiler`` needs to be present in ``LDFLAGS``. [GL !4045] +- The ``glue-cache`` *option* has been marked as deprected. The glue + cache *feature* still works and will be permanently *enabled* in a + future release. [GL #2146] + Feature Changes ~~~~~~~~~~~~~~~ diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c index fa01cdf41b..87f8aaec68 100644 --- 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