Log a message when "ixfr-from-differences" is set for an inline-signed zone

For inline-signed zones, the value of "ixfr-from-differences" is
hardcoded to:

  - "yes" for the raw version of the zone,
  - "no" for the signed version of the zone.

In other words, any user-provided "ixfr-from-differences" setting is
effectively ignored for an inline-signed zone.  Ensure the user is aware
of that by adding a note to the ARM and logging a message when an
"ixfr-from-differences" option is found at the zone level.

(cherry picked from commit 087157d14fb201a61207599698097b08bbc6feae)

diff --git a/bin/named/server.c b/bin/named/server.c
index 9f88a4088a0eeff067a1e417a3a8d0d929bc3b20..e3da808bbbbd257aa78bcbf5e7d98d5797a436be 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -5304,6 +5304,7 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig,
        const cfg_obj_t *typeobj = NULL;
        const cfg_obj_t *forwarders = NULL;
        const cfg_obj_t *forwardtype = NULL;
+       const cfg_obj_t *ixfrfromdiffs = NULL;
        const cfg_obj_t *only = NULL;
        const cfg_obj_t *signing = NULL;
        const cfg_obj_t *viewobj = NULL;
@@ -5657,6 +5658,15 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig,
                        dns_zone_setstats(raw, ns_g_server->zonestats);
                        CHECK(dns_zone_link(zone, raw));
                }
+               if (cfg_map_get(zoptions, "ixfr-from-differences",
+                               &ixfrfromdiffs) == ISC_R_SUCCESS)
+               {
+                       isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
+                                     NS_LOGMODULE_SERVER, ISC_LOG_INFO,
+                                     "zone '%s': 'ixfr-from-differences' is "
+                                     "ignored for inline-signed zones",
+                                     zname);
+               }
        }
 
        /*

diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 3ecdc046d0ae5c51913294e08913280e6767f778..884b85500167e7ab2072f408082e789b2e669509 100644 (file)
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -6608,6 +6608,11 @@ options {
                  <command>slave</command> zones respectively.
                  It is off by default.
                </para>
+               <para>
+                 Note: if inline signing is enabled for a zone, the
+                 user-provided <command>ixfr-from-differences</command>
+                 setting is ignored for that zone.
+               </para>
              </listitem>
            </varlistentry>