From: Ondřej Surý <ondrej@sury.org>
Date: Thu, 16 Sep 2021 08:38:22 +0000 (+0200)
Subject: Mark the masterfile-format type 'map' as deprecated
X-Git-Tag: v9.17.19~32^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6b7a488cbcedf0fcb3f9de3e8e63795afd599781;p=thirdparty%2Fbind9.git

Mark the masterfile-format type 'map' as deprecated

The map masterfile-format is very fragile and it needs API bump every
time a RBTDB data structures changes.  Also while testing it, we found
out that files larger than 2GB weren't loading and nobody noticed, and
loading many map files were also failing (subject to kernel limits).

Thus we are marking the masterfile-format type 'map' as deprecated and
to be removed in the next stable BIND 9 release.
---

diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
index 92fa47cc9ff..d61fb4f2a56 100644
--- a/bin/named/zoneconf.c
+++ b/bin/named/zoneconf.c
@@ -1053,6 +1053,9 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
 			masterformat = dns_masterformat_raw;
 		} else if (strcasecmp(masterformatstr, "map") == 0) {
 			masterformat = dns_masterformat_map;
+			cfg_obj_log(obj, named_g_lctx, ISC_LOG_WARNING,
+				    "masterfile-format: format 'map' is "
+				    "deprecated");
 		} else {
 			INSIST(0);
 			ISC_UNREACHABLE();
diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index 5cc360624e8..7189a8d4c6d 100644
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -3459,6 +3459,9 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions,
 			masterformat = dns_masterformat_raw;
 		} else if (strcasecmp(masterformatstr, "map") == 0) {
 			masterformat = dns_masterformat_map;
+			cfg_obj_log(obj, logctx, ISC_LOG_WARNING,
+				    "masterfile-format: format 'map' is "
+				    "deprecated");
 		} else {
 			INSIST(0);
 			ISC_UNREACHABLE();