upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-04-29 09:59:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '2146-deprecate-the-glue-cache-option' into 'main'

Browse source 
Deprecate the "glue-cache" option

Closes #2146

See merge request isc-projects/bind9!4123
This commit is contained in:
Michał Kępień 2020-09-16 09:19:15 +00:00
commit cc97353750
12 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -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]

4
bin/named/named.conf.rst
View file

@ -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 );

1
bin/named/server.c
View file

@ -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);

1
bin/tests/system/statistics/ns3/named.conf.in
View file

@ -23,7 +23,6 @@ options {
notify yes;
qname-minimization disabled;
zone-statistics yes;
glue-cache yes;
};
statistics-channels {

3
doc/arm/reference.rst
View file

@ -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,

4
doc/man/named.conf.5in
View file

@ -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 );

4
doc/misc/named.conf.rst
View file

@ -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 );

4
doc/misc/options
View file

@ -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> );

4
doc/misc/options.active
View file

@ -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> );

2
doc/misc/options.grammar.rst
View file

@ -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>;

4
doc/notes/notes-current.rst
View file

@ -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
~~~~~~~~~~~~~~~

2
lib/isccfg/namedconf.c
View file

@ -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