From: Mark Andrews <marka@isc.org>
Date: Thu, 1 May 2014 05:03:11 +0000 (+1000)
Subject: protect geoip_elem use with HAVE_GEOIP
X-Git-Tag: v9.11.0a1~1675
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=c2638d3d5ab1fa10fde4026e92c5ffff23b77bdf;p=thirdparty%2Fbind9.git

protect geoip_elem use with HAVE_GEOIP
---

diff --git a/lib/dns/acl.c b/lib/dns/acl.c
index 1064bce9a41..64cc08a7929 100644
--- a/lib/dns/acl.c
+++ b/lib/dns/acl.c
@@ -337,11 +337,13 @@ dns_acl_merge(dns_acl_t *dest, dns_acl_t *source, isc_boolean_t pos)
 				return result;
 		}
 
+#ifdef HAVE_GEOIP
 		/* Duplicate GeoIP data */
 		if (source->elements[i].type == dns_aclelementtype_geoip) {
 			dest->elements[nelem + i].geoip_elem =
 				source->elements[i].geoip_elem;
 		}
+#endif
 
 		/* reverse sense of positives if this is a negative acl */
 		if (!pos && source->elements[i].negative == ISC_FALSE) {