ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

deprecate "dialup" and "heartbeat-interval"

Browse Source 
these options concentrate zone maintenance actions into
bursts for the benefit of servers with intermittent connections.
that's no longer something we really need to optimize.

(cherry picked from commit eeeccec67c)
This commit is contained in:
Evan Hunt
2023-07-03 16:34:22 -07:00
parent c17cbc371c
commit 3cc1e5e12a
8 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bin/tests/system/checkconf/deprecated.conf
View File

@@ -18,6 +18,9 @@ server 1.2.3.4 {
options {
dnssec-validation yes;
dialup yes;
heartbeat-interval 60;
use-v4-udp-ports { range 1024 65535; };
use-v6-udp-ports { range 1024 65535; };
avoid-v4-udp-ports { range 1 1023; };

2
bin/tests/system/checkconf/tests.sh
View File

@@ -173,6 +173,8 @@ grep "option 'delegation-only' is deprecated" < checkconf.out$n.1 > /dev/null ||
grep "option 'tkey-dhkey' is deprecated" < checkconf.out$n.1 > /dev/null || ret=1
grep "option 'root-delegation-only' is deprecated" < checkconf.out$n.1 > /dev/null || ret=1
grep "'type delegation-only' is deprecated" < checkconf.out$n.1 > /dev/null || ret=1
grep "option 'dialup' is deprecated" < checkconf.out$n.1 > /dev/null || ret=1
grep "option 'heartbeat-interval' is deprecated" < checkconf.out$n.1 > /dev/null || ret=1
grep "token 'port' is deprecated" < checkconf.out$n.1 > /dev/null || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status + ret))

8
doc/arm/reference.rst
View File

@@ -2055,9 +2055,11 @@ Boolean Options
record <named -m>` is specified on the command line, in which case it is ``yes``.
.. namedconf:statement:: dialup
:tags: transfer
:tags: deprecated
:short: Concentrates zone maintenance so that all transfers take place once every :any:`heartbeat-interval`, ideally during a single call.
This option is deprecated and will be removed in a future release.
If ``yes``, then the server treats all zones as if they are doing
zone transfers across a dial-on-demand dialup link, which can be
brought up by traffic originating from this server. Although this setting has
@@ -4028,7 +4030,7 @@ Periodic Task Intervals
^^^^^^^^^^^^^^^^^^^^^^^
.. namedconf:statement:: heartbeat-interval
:tags: zone
:tags: deprecated
:short: Sets the interval at which the server performs zone maintenance tasks for all zones marked as :any:`dialup`.
The server performs zone maintenance tasks for all zones marked
@@ -4037,6 +4039,8 @@ Periodic Task Intervals
maximum value is 28 days (40320 minutes). If set to 0, no zone
maintenance for these zones occurs.
This option is deprecated and will be removed in a future release.
.. namedconf:statement:: interface-interval
:tags: server
:short: Sets the interval at which the server scans the network interface list.

6
doc/misc/options
View File

@@ -98,7 +98,7 @@ options {
datasize ( default | unlimited | <sizeval> ); // deprecated
deny-answer-addresses { <address_match_element>; ... } [ except-from { <string>; ... } ];
deny-answer-aliases { <string>; ... } [ except-from { <string>; ... } ];
dialup ( notify | notify-passive | passive | refresh | <boolean> );
dialup ( notify | notify-passive | passive | refresh | <boolean> ); // deprecated
directory <quoted_string>;
disable-algorithms <string> { <string>; ... }; // may occur multiple times
disable-ds-digests <string> { <string>; ... }; // may occur multiple times
@@ -151,7 +151,7 @@ options {
fstrm-set-reopen-interval <duration>; // not configured
geoip-directory ( <quoted_string> | none );
glue-cache <boolean>; // deprecated
heartbeat-interval <integer>;
heartbeat-interval <integer>; // deprecated
hostname ( <quoted_string> | none );
http-listener-clients <integer>;
http-port <integer>;
@@ -404,7 +404,7 @@ view <string> [ <class> ] {
clients-per-query <integer>;
deny-answer-addresses { <address_match_element>; ... } [ except-from { <string>; ... } ];
deny-answer-aliases { <string>; ... } [ except-from { <string>; ... } ];
dialup ( notify | notify-passive | passive | refresh | <boolean> );
dialup ( notify | notify-passive | passive | refresh | <boolean> ); // deprecated
disable-algorithms <string> { <string>; ... }; // may occur multiple times
disable-ds-digests <string> { <string>; ... }; // may occur multiple times
disable-empty-zone <string>; // may occur multiple times

2
doc/misc/primary.zoneopt
View File

@@ -18,7 +18,7 @@ zone <string> [ <class> ] {
check-srv-cname ( fail | warn | ignore );
check-wildcard <boolean>;
database <string>;
dialup ( notify | notify-passive | passive | refresh | <boolean> );
dialup ( notify | notify-passive | passive | refresh | <boolean> ); // deprecated
dlz <string>;
dnskey-sig-validity <integer>;
dnssec-dnskey-kskonly <boolean>;

2
doc/misc/secondary.zoneopt
View File

@@ -11,7 +11,7 @@ zone <string> [ <class> ] {
auto-dnssec ( allow | maintain | off ); // deprecated
check-names ( fail | warn | ignore );
database <string>;
dialup ( notify | notify-passive | passive | refresh | <boolean> );
dialup ( notify | notify-passive | passive | refresh | <boolean> ); // deprecated
dlz <string>;
dnskey-sig-validity <integer>;
dnssec-dnskey-kskonly <boolean>;

2
doc/misc/stub.zoneopt
View File

@@ -5,7 +5,7 @@ zone <string> [ <class> ] {
check-names ( fail | warn | ignore );
database <string>;
delegation-only <boolean>; // deprecated
dialup ( notify | notify-passive | passive | refresh | <boolean> );
dialup ( notify | notify-passive | passive | refresh | <boolean> ); // deprecated
file <quoted_string>;
forward ( first | only );
forwarders [ port <integer> ] { ( <ipv4_address> | <ipv6_address> ) [ port <integer> ]; ... };

5
lib/isccfg/namedconf.c
View File

@@ -1274,7 +1274,7 @@ static cfg_clausedef_t options_clauses[] = {
#endif /* HAVE_GEOIP2 */
{ "geoip-use-ecs", NULL, CFG_CLAUSEFLAG_ANCIENT },
{ "has-old-clients", NULL, CFG_CLAUSEFLAG_ANCIENT },
{ "heartbeat-interval", &cfg_type_uint32, 0 },
{ "heartbeat-interval", &cfg_type_uint32, CFG_CLAUSEFLAG_DEPRECATED },
{ "host-statistics", NULL, CFG_CLAUSEFLAG_ANCIENT },
{ "host-statistics-max", NULL, CFG_CLAUSEFLAG_ANCIENT },
{ "hostname", &cfg_type_qstringornone, 0 },
@@ -2264,7 +2264,8 @@ static cfg_clausedef_t zone_clauses[] = {
{ "check-srv-cname", &cfg_type_checkmode, CFG_ZONE_PRIMARY },
{ "check-wildcard", &cfg_type_boolean, CFG_ZONE_PRIMARY },
{ "dialup", &cfg_type_dialuptype,
CFG_ZONE_PRIMARY | CFG_ZONE_SECONDARY | CFG_ZONE_STUB },
CFG_ZONE_PRIMARY | CFG_ZONE_SECONDARY | CFG_ZONE_STUB |
CFG_CLAUSEFLAG_DEPRECATED },
{ "dnssec-dnskey-kskonly", &cfg_type_boolean,
CFG_ZONE_PRIMARY | CFG_ZONE_SECONDARY },
{ "dnssec-loadkeys-interval", &cfg_type_uint32,