From: Michał Kępień <michal@isc.org>
Date: Thu, 9 Jan 2025 11:16:48 +0000 (+0100)
Subject: Fix default IANA root zone mirror configuration
X-Git-Tag: v9.21.4~5^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=010d2eb4360afd5f4049491f5e73e25003895106;p=thirdparty%2Fbind9.git

Fix default IANA root zone mirror configuration

Commit b121f02eac342ee285b6ab1292a0136448a91ee0 renamed the top-level
"primaries" block in bin/named/config.c to "remote-servers".  This
configuration block lists the primary servers used for an IANA root zone
mirror when no primary servers are explicitly specified for it in the
configuration.  However, the relevant part of the named_zone_configure()
function only looks for a top-level "primaries" block and not for any of
its synonyms.  As a result, configuring an IANA root zone mirror with
just:

    zone "." {
        type mirror;
    };

now results in a cryptic fatal error on startup:

    loading configuration: not found
    exiting (due to fatal error)

Fix by using the correct top-level block name in named_zone_configure().
---

diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
index 2e9b754f2f0..f2b178b8722 100644
--- a/bin/named/zoneconf.c
+++ b/bin/named/zoneconf.c
@@ -1852,7 +1852,7 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
 		    dns_name_equal(dns_zone_getorigin(zone), dns_rootname))
 		{
 			result = named_config_getremotesdef(
-				named_g_config, "primaries",
+				named_g_config, "remote-servers",
 				DEFAULT_IANA_ROOT_ZONE_PRIMARIES, &obj);
 			CHECK(result);
 		}