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 92fa47cc9ff8d3804f5e954f3b5b1d0d118cb9b7..d61fb4f2a56d2cc6684ac15a203881651d1d1c50 100644 (file)
--- 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 5cc360624e895f75b42d2e7542523b2a19794567..7189a8d4c6de48f1a53381f5b5b8fca717e7f157 100644 (file)
--- 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();