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.

(cherry picked from commit 6b7a488cbcedf0fcb3f9de3e8e63795afd599781)

diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
index 87d5b9fcdc38ce669b62768d4cda5cfe16c3159c..32cc034963b3358b15041fa1f59000d3736fbbb8 100644 (file)
--- a/bin/named/zoneconf.c
+++ b/bin/named/zoneconf.c
@@ -1032,6 +1032,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 8abdcdffa41a04b96807f7940f222cbe26cc6b38..66dfbd1122a2870e49af87cc06480f64a606af60 100644 (file)
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -3172,6 +3172,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();