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 1b20a87957b7cf242de2ddc9248d0702839d74df..60b1e23d701d72ebd421553b4179e52c7065ccd2 100644 (file)
--- 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 76613b146974bd9b49bca02a5a4da5c0bce24a97..852350a1971b1f45ac8da66893990ab266cccdf8 100644 (file)
--- 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 },