Fix the default interface-interval docs and default value

When the interface-interval parser was changed from uint32 parser to
duration parser, the default value stayed at plain 60 which now means 60
seconds instead of 60 minutes.  Fix the default value and the
documentation to match the reality.

(cherry picked from commit de08c0088dbdeac7e97c343835f4fdb465dff27d)

diff --git a/bin/named/config.c b/bin/named/config.c
index 62acda6b704e590f39e8c6cb2d82ebe28eb16a0c..94759361ae4a9a4bc94594a726441d441301c485 100644 (file)
--- a/bin/named/config.c
+++ b/bin/named/config.c
@@ -64,7 +64,7 @@ options {\n\
 #endif /* if defined(HAVE_GEOIP2) */
                            "\
        heartbeat-interval 60;\n\
-       interface-interval 60;\n\
+       interface-interval 60m;\n                                       \
        listen-on {any;};\n\
        listen-on-v6 {any;};\n\
        match-mapped-addresses no;\n\

diff --git a/doc/arm/reference.rst b/doc/arm/reference.rst
index 17b3b6a1771cdc97503c59fc53f382062c26654b..8678fb5db98ce212ae322a41026e30791d38e9f7 100644 (file)
--- a/doc/arm/reference.rst
+++ b/doc/arm/reference.rst
@@ -4119,9 +4119,10 @@ Periodic Task Intervals
    :tags: server
    :short: Sets the interval at which the server scans the network interface list.
 
-   The server scans the network interface list every :any:`interface-interval`
-   minutes. The default is 60 minutes; the maximum value is 28 days (40320
-   minutes). If set to 0, interface scanning only occurs when the configuration
+   The server scans the network interface list on every interval as specified by
+   :any:`interface-interval`.
+
+   If set to 0, interface scanning only occurs when the configuration
    file is loaded, or when :any:`automatic-interface-scan` is enabled and supported
    by the operating system. After the scan, the server begins listening for
    queries on any newly discovered interfaces (provided they are allowed by the
@@ -4129,6 +4130,8 @@ Periodic Task Intervals
    gone away. For convenience, TTL-style time-unit suffixes may be used to
    specify the value. It also accepts ISO 8601 duration formats.
 
+   The default is 60 minutes (1 hour); the maximum value is 28 days.
+
 The :any:`sortlist` Statement
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^