From: Mark Andrews <marka@isc.org>
Date: Fri, 28 Jul 2017 06:02:52 +0000 (+1000)
Subject: 4659.   [bug]           Remove spurious log message about lmdb-mapsize
X-Git-Tag: v9.12.0a1~170
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=71cd6910bab9936f74f408e244b11ffec106cf87;p=thirdparty%2Fbind9.git

4659.   [bug]           Remove spurious log message about lmdb-mapsize
                        not being supported when parsing builtin
                        configuration file. [RT #45618]
---

diff --git a/CHANGES b/CHANGES
index 74f5cac7613..0bde134afd4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+4659.   [bug]           Remove spurious log message about lmdb-mapsize
+			not being supported when parsing builtin
+			configuration file. [RT #45618]
+
 4658.	[bug]		Clean up build directory created by "setup.py install"
 			immediately.  [RT #45628]
 
diff --git a/bin/named/config.c b/bin/named/config.c
index f174096d037..db9376dfcc4 100644
--- a/bin/named/config.c
+++ b/bin/named/config.c
@@ -176,7 +176,13 @@ options {\n\
 	zero-no-soa-ttl-cache no;\n\
 	nsec3-test-zone no;\n\
 	allow-new-zones no;\n\
+"
+#ifdef HAVE_LMDB
+"\
 	lmdb-mapsize 32M;\n\
+"
+#endif
+"\
 	fetches-per-server 0;\n\
 	require-server-cookie no;\n\
 	v6-bias 50;\n\