From: Mark Andrews <marka@isc.org>
Date: Mon, 14 Aug 2017 06:18:26 +0000 (+0000)
Subject: 4678.   [bug]           geoip-use-ecs has the wrong type when geoip support
X-Git-Tag: v9.12.0a1~121
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=cc88df4f017508a2030abcc84c8197e0c4ce5f7d;p=thirdparty%2Fbind9.git

4678.   [bug]           geoip-use-ecs has the wrong type when geoip support
                        is disabled at configure time. [RT #45763]
---

diff --git a/CHANGES b/CHANGES
index 1b20a87957b..60b1e23d701 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4678.	[bug]		geoip-use-ecs has the wrong type when geoip support
+			is disabled at configure time. [RT #45763]
+ 
 4677.	[cleanup]	Split up the main function in dig to better support
 			the iOS app version. [RT #45508]
 
diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index 76613b14697..852350a1971 100644
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -1081,8 +1081,7 @@ options_clauses[] = {
 #else
 	{ "geoip-directory", &cfg_type_qstringornone,
 	  CFG_CLAUSEFLAG_NOTCONFIGURED },
-	{ "geoip-use-ecs", &cfg_type_qstringornone,
-	  CFG_CLAUSEFLAG_NOTCONFIGURED },
+	{ "geoip-use-ecs", &cfg_type_boolean, CFG_CLAUSEFLAG_NOTCONFIGURED },
 #endif /* HAVE_GEOIP */
 	{ "has-old-clients", &cfg_type_boolean, CFG_CLAUSEFLAG_OBSOLETE },
 	{ "heartbeat-interval", &cfg_type_uint32, 0 },