mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 14:35:26 +00:00
Code Issues Releases Wiki Activity

Merge branch '3700-deprecate-dialup' into 'main'

Browse Source 
deprecate "dialup" and "heartbeat-interval"

Closes #3700

See merge request isc-projects/bind9!8080
This commit is contained in:
Evan Hunt
2023-08-02 01:38:27 +00:00
parent cd0f115082 d10b6a4b39
commit 39f46fc128
10 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,3 +1,6 @@
6220. [func] Deprecate the 'dialup' and 'heartbeat-interval'
options. [GL #3700]
6219. [bug] Ignore 'max-zone-ttl' on 'dnssec-policy insecure'. 6219. [bug] Ignore 'max-zone-ttl' on 'dnssec-policy insecure'.
[GL #4032] [GL #4032]

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

@@ -19,6 +19,9 @@ options {
dnssec-validation yes; dnssec-validation yes;
max-zone-ttl 600; max-zone-ttl 600;
dialup yes;
heartbeat-interval 60;
use-v4-udp-ports { range 1024 65535; }; use-v4-udp-ports { range 1024 65535; };
use-v6-udp-ports { range 1024 65535; }; use-v6-udp-ports { range 1024 65535; };
avoid-v4-udp-ports { range 1 1023; }; avoid-v4-udp-ports { range 1 1023; };

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

@@ -153,6 +153,8 @@ grep "option 'use-v4-udp-ports' is deprecated" < checkconf.out$n.1 > /dev/null |
grep "option 'use-v6-udp-ports' is deprecated" < checkconf.out$n.1 > /dev/null || ret=1 grep "option 'use-v6-udp-ports' is deprecated" < checkconf.out$n.1 > /dev/null || ret=1
grep "option 'avoid-v4-udp-ports' is deprecated" < checkconf.out$n.1 > /dev/null || ret=1 grep "option 'avoid-v4-udp-ports' is deprecated" < checkconf.out$n.1 > /dev/null || ret=1
grep "option 'avoid-v6-udp-ports' is deprecated" < checkconf.out$n.1 > /dev/null || ret=1 grep "option 'avoid-v6-udp-ports' 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 grep "token 'port' is deprecated" < checkconf.out$n.1 > /dev/null || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status + ret)) status=$((status + ret))

8
doc/arm/reference.rst
View File

@@ -1973,9 +1973,11 @@ Boolean Options
record <named -m>` is specified on the command line, in which case it is ``yes``. record <named -m>` is specified on the command line, in which case it is ``yes``.
.. namedconf:statement:: dialup .. 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. :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 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 zone transfers across a dial-on-demand dialup link, which can be
brought up by traffic originating from this server. Although this setting has brought up by traffic originating from this server. Although this setting has
@@ -3793,7 +3795,7 @@ Periodic Task Intervals
^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^
.. namedconf:statement:: heartbeat-interval .. 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`. :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 The server performs zone maintenance tasks for all zones marked
@@ -3802,6 +3804,8 @@ Periodic Task Intervals
maximum value is 28 days (40320 minutes). If set to 0, no zone maximum value is 28 days (40320 minutes). If set to 0, no zone
maintenance for these zones occurs. maintenance for these zones occurs.
This option is deprecated and will be removed in a future release.
.. namedconf:statement:: interface-interval .. namedconf:statement:: interface-interval
:tags: server :tags: server
:short: Sets the interval at which the server scans the network interface list. :short: Sets the interval at which the server scans the network interface list.

6
doc/misc/options
View File

@@ -96,7 +96,7 @@ options {
cookie-secret <string>; // may occur multiple times cookie-secret <string>; // may occur multiple times
deny-answer-addresses { <address_match_element>; ... } [ except-from { <string>; ... } ]; deny-answer-addresses { <address_match_element>; ... } [ except-from { <string>; ... } ];
deny-answer-aliases { <string>; ... } [ 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>; directory <quoted_string>;
disable-algorithms <string> { <string>; ... }; // may occur multiple times disable-algorithms <string> { <string>; ... }; // may occur multiple times
disable-ds-digests <string> { <string>; ... }; // may occur multiple times disable-ds-digests <string> { <string>; ... }; // may occur multiple times
@@ -147,7 +147,7 @@ options {
fstrm-set-output-queue-size <integer>; // not configured fstrm-set-output-queue-size <integer>; // not configured
fstrm-set-reopen-interval <duration>; // not configured fstrm-set-reopen-interval <duration>; // not configured
geoip-directory ( <quoted_string> | none ); geoip-directory ( <quoted_string> | none );
heartbeat-interval <integer>; heartbeat-interval <integer>; // deprecated
hostname ( <quoted_string> | none ); hostname ( <quoted_string> | none );
http-listener-clients <integer>; http-listener-clients <integer>;
http-port <integer>; http-port <integer>;
@@ -392,7 +392,7 @@ view <string> [ <class> ] {
clients-per-query <integer>; clients-per-query <integer>;
deny-answer-addresses { <address_match_element>; ... } [ except-from { <string>; ... } ]; deny-answer-addresses { <address_match_element>; ... } [ except-from { <string>; ... } ];
deny-answer-aliases { <string>; ... } [ 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-algorithms <string> { <string>; ... }; // may occur multiple times
disable-ds-digests <string> { <string>; ... }; // may occur multiple times disable-ds-digests <string> { <string>; ... }; // may occur multiple times
disable-empty-zone <string>; // may occur multiple times disable-empty-zone <string>; // may occur multiple times

2
doc/misc/primary.zoneopt
View File

@@ -17,7 +17,7 @@ zone <string> [ <class> ] {
check-wildcard <boolean>; check-wildcard <boolean>;
checkds ( explicit | <boolean> ); checkds ( explicit | <boolean> );
database <string>; database <string>;
dialup ( notify | notify-passive | passive | refresh | <boolean> ); dialup ( notify | notify-passive | passive | refresh | <boolean> ); // deprecated
dlz <string>; dlz <string>;
dnskey-sig-validity <integer>; // obsolete dnskey-sig-validity <integer>; // obsolete
dnssec-dnskey-kskonly <boolean>; // obsolete dnssec-dnskey-kskonly <boolean>; // obsolete

2
doc/misc/secondary.zoneopt
View File

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

2
doc/misc/stub.zoneopt
View File

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

9
doc/notes/notes-current.rst
View File

@@ -27,9 +27,12 @@ Removed Features
- The 'auto-dnssec' configuration option has now been removed. Please - The 'auto-dnssec' configuration option has now been removed. Please
use :any:`dnssec-policy` or manual signing instead. The following options use :any:`dnssec-policy` or manual signing instead. The following options
have become obsolete: :any:`dnskey-sig-validity`, :any:`dnssec-dnskey-kskonly`, have become obsolete: :any:`dnskey-sig-validity`,
:any:`dnssec-update-mode`, :any:`sig-validity-interval`, and :any:`dnssec-dnskey-kskonly`, :any:`dnssec-update-mode`,
:any:`update-check-ksk`. :gl:`#3672`. :any:`sig-validity-interval`, and :any:`update-check-ksk`. :gl:`#3672`.
- The :any:`dialup` and :any:`heartbeat-interval` options have been
deprecated and will be removed in a future release. :gl:`#3700`
Feature Changes Feature Changes
~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~

5
lib/isccfg/namedconf.c
View File

@@ -1260,7 +1260,7 @@ static cfg_clausedef_t options_clauses[] = {
#endif /* HAVE_GEOIP2 */ #endif /* HAVE_GEOIP2 */
{ "geoip-use-ecs", NULL, CFG_CLAUSEFLAG_ANCIENT }, { "geoip-use-ecs", NULL, CFG_CLAUSEFLAG_ANCIENT },
{ "has-old-clients", 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", NULL, CFG_CLAUSEFLAG_ANCIENT },
{ "host-statistics-max", NULL, CFG_CLAUSEFLAG_ANCIENT }, { "host-statistics-max", NULL, CFG_CLAUSEFLAG_ANCIENT },
{ "hostname", &cfg_type_qstringornone, 0 }, { "hostname", &cfg_type_qstringornone, 0 },
@@ -2274,7 +2274,8 @@ static cfg_clausedef_t zone_clauses[] = {
{ "check-svcb", &cfg_type_boolean, CFG_ZONE_PRIMARY }, { "check-svcb", &cfg_type_boolean, CFG_ZONE_PRIMARY },
{ "check-wildcard", &cfg_type_boolean, CFG_ZONE_PRIMARY }, { "check-wildcard", &cfg_type_boolean, CFG_ZONE_PRIMARY },
{ "dialup", &cfg_type_dialuptype, { "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, { "dnssec-dnskey-kskonly", &cfg_type_boolean,
CFG_ZONE_PRIMARY | CFG_ZONE_SECONDARY | CFG_CLAUSEFLAG_OBSOLETE }, CFG_ZONE_PRIMARY | CFG_ZONE_SECONDARY | CFG_CLAUSEFLAG_OBSOLETE },
{ "dnssec-loadkeys-interval", &cfg_type_uint32, { "dnssec-loadkeys-interval", &cfg_type_uint32,