deprecate "dialup" and "heartbeat-interval"

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 eeeccec67cafb7a0ab863532ed631fbacc339a26)

diff --git a/bin/tests/system/checkconf/deprecated.conf b/bin/tests/system/checkconf/deprecated.conf
index 11853745107fdea7ae8c128dd78296752dcf5a63..e332f6e4dda1f54dca0531b6d5012b8c2eb7c46e 100644 (file)
--- a/bin/tests/system/checkconf/deprecated.conf
+++ b/bin/tests/system/checkconf/deprecated.conf
@@ -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; };

diff --git a/bin/tests/system/checkconf/tests.sh b/bin/tests/system/checkconf/tests.sh
index 6604a2ab58c5a91bbb3d82b0d0bfe704b791356f..b3aca64c09b41f9ad83834239a7a6c73a0e06174 100644 (file)
--- a/bin/tests/system/checkconf/tests.sh
+++ b/bin/tests/system/checkconf/tests.sh
@@ -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))

diff --git a/doc/arm/reference.rst b/doc/arm/reference.rst
index bc294a676e3c932cbad535aafdbfb5aefc1e879e..178c26c97fb825c4e090ba0b671292e244969364 100644 (file)
--- a/doc/arm/reference.rst
+++ b/doc/arm/reference.rst
@@ -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.

diff --git a/doc/misc/options b/doc/misc/options
index 78eaa1f5821863cb31c5197629226f516b863bf3..017f1a5c969629d81c70bc9a6094cb66ee177376 100644 (file)
--- a/doc/misc/options
+++ b/doc/misc/options
@@ -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

diff --git a/doc/misc/primary.zoneopt b/doc/misc/primary.zoneopt
index 6217bb76ab0406efe33c6ecc2b6711c2a4b57f01..8f646e3560f4157563ddd59c5503d8ddfbb4344c 100644 (file)
--- a/doc/misc/primary.zoneopt
+++ b/doc/misc/primary.zoneopt
@@ -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>;

diff --git a/doc/misc/secondary.zoneopt b/doc/misc/secondary.zoneopt
index fb5830910c194b8ca7768becd0939a2ca74cf0a1..3237aab04d2bd256c578d455b7a47ab91de7129b 100644 (file)
--- a/doc/misc/secondary.zoneopt
+++ b/doc/misc/secondary.zoneopt
@@ -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>;

diff --git a/doc/misc/stub.zoneopt b/doc/misc/stub.zoneopt
index c7bcbeef09b449dc0c5bcaee427eb719deff61d2..29c1d56e3f3cb3beb1fab68f23307ca6bcfba911 100644 (file)
--- a/doc/misc/stub.zoneopt
+++ b/doc/misc/stub.zoneopt
@@ -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> ]; ... };

diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index c500bce9b81724ba1c298d30f20772603e88152d..918d3c0a94ed9b3adfcdcda68a71d0c4b1ca5d88 100644 (file)
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -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,