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.

diff --git a/bin/tests/system/checkconf/deprecated.conf b/bin/tests/system/checkconf/deprecated.conf
index 548b144d15e1bbbfad2d3d12a519457b96ca1cdd..bdda4c80c09f86e8dfb12efc8cf5cb8526bd18c4 100644 (file)
--- a/bin/tests/system/checkconf/deprecated.conf
+++ b/bin/tests/system/checkconf/deprecated.conf
@@ -19,6 +19,9 @@ options {
        dnssec-validation yes;
        max-zone-ttl 600;
 
+        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 6c18835c1605481cdd98240f247c33ef3b669766..94a1d3a7f3ff7a938e0289053e03fbcbc764be28 100644 (file)
--- a/bin/tests/system/checkconf/tests.sh
+++ b/bin/tests/system/checkconf/tests.sh
@@ -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 '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 '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 96a7ebb6b0fcf3a8b230e36b71e715beb3167270..2e131908e953f20aa3fa1d7c6e7ba0286861f0e8 100644 (file)
--- a/doc/arm/reference.rst
+++ b/doc/arm/reference.rst
@@ -1973,9 +1973,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
@@ -3793,7 +3795,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
@@ -3802,6 +3804,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 537da0fe24f28882ba3407dfcd784ccd96ad2b2c..edb8e862909bd16644c69d372f5eefa8c0ac8f43 100644 (file)
--- a/doc/misc/options
+++ b/doc/misc/options
@@ -96,7 +96,7 @@ options {
        cookie-secret <string>; // may occur multiple times
        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
@@ -147,7 +147,7 @@ options {
        fstrm-set-output-queue-size <integer>; // not configured
        fstrm-set-reopen-interval <duration>; // not configured
        geoip-directory ( <quoted_string> | none );
-       heartbeat-interval <integer>;
+       heartbeat-interval <integer>; // deprecated
        hostname ( <quoted_string> | none );
        http-listener-clients <integer>;
        http-port <integer>;
@@ -392,7 +392,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 a7be8839e7989d7ccd53920ac1690c57e74cec63..e3c6ef69d5106600bc7493bcbdadf15ad7bcaf37 100644 (file)
--- a/doc/misc/primary.zoneopt
+++ b/doc/misc/primary.zoneopt
@@ -17,7 +17,7 @@ zone <string> [ <class> ] {
        check-wildcard <boolean>;
        checkds ( explicit | <boolean> );
        database <string>;
-       dialup ( notify | notify-passive | passive | refresh | <boolean> );
+       dialup ( notify | notify-passive | passive | refresh | <boolean> ); // deprecated
        dlz <string>;
        dnskey-sig-validity <integer>; // obsolete
        dnssec-dnskey-kskonly <boolean>; // obsolete

diff --git a/doc/misc/secondary.zoneopt b/doc/misc/secondary.zoneopt
index 2f7c1b049f3ac63adc712e141a88df67b1f9f6b0..26eca8e20a75ad3829c8cb85f464d99142be80df 100644 (file)
--- a/doc/misc/secondary.zoneopt
+++ b/doc/misc/secondary.zoneopt
@@ -9,7 +9,7 @@ zone <string> [ <class> ] {
        check-names ( fail | warn | ignore );
        checkds ( explicit | <boolean> );
        database <string>;
-       dialup ( notify | notify-passive | passive | refresh | <boolean> );
+       dialup ( notify | notify-passive | passive | refresh | <boolean> ); // deprecated
        dlz <string>;
        dnskey-sig-validity <integer>; // obsolete
        dnssec-dnskey-kskonly <boolean>; // obsolete

diff --git a/doc/misc/stub.zoneopt b/doc/misc/stub.zoneopt
index c7ee0ed75c5079e728c225a3ed0a885b88c52f8c..6d7c98cb45684e4350a5f89d6f809764eb955420 100644 (file)
--- a/doc/misc/stub.zoneopt
+++ b/doc/misc/stub.zoneopt
@@ -4,7 +4,7 @@ zone <string> [ <class> ] {
        allow-query-on { <address_match_element>; ... };
        check-names ( fail | warn | ignore );
        database <string>;
-       dialup ( notify | notify-passive | passive | refresh | <boolean> );
+       dialup ( notify | notify-passive | passive | refresh | <boolean> ); // deprecated
        file <quoted_string>;
        forward ( first | only );
        forwarders [ port <integer> ] [ tls <string> ] { ( <ipv4_address> | <ipv6_address> ) [ port <integer> ] [ tls <string> ]; ... };

diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index 23da61eb61bce17c2694e2c9079db06978560e62..97ed56c515234f54fe27b344bac47c58691254d2 100644 (file)
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -1260,7 +1260,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 },
@@ -2274,7 +2274,8 @@ static cfg_clausedef_t zone_clauses[] = {
        { "check-svcb", &cfg_type_boolean, 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 | CFG_CLAUSEFLAG_OBSOLETE },
        { "dnssec-loadkeys-interval", &cfg_type_uint32,