From 087157d14fb201a61207599698097b08bbc6feae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Fri, 24 Aug 2018 10:18:59 +0200 Subject: [PATCH] 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. --- bin/named/server.c | 10 ++++++++++ doc/arm/Bv9ARM-book.xml | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/bin/named/server.c b/bin/named/server.c index 79e6dd2655..b7fbccdfec 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -5778,6 +5778,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; @@ -6131,6 +6132,15 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig, dns_zone_setstats(raw, named_g_server->zonestats); CHECK(dns_zone_link(zone, raw)); } + if (cfg_map_get(zoptions, "ixfr-from-differences", + &ixfrfromdiffs) == ISC_R_SUCCESS) + { + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_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 0ee094c4a6..7dc6bba279 100644 --- a/doc/arm/Bv9ARM-book.xml +++ b/doc/arm/Bv9ARM-book.xml @@ -6515,6 +6515,11 @@ options { all primary or secondary zones, respectively. It is off for all zones by default. + + Note: if inline signing is enabled for a zone, the + user-provided ixfr-from-differences + setting is ignored for that zone. +