]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
protect geoip_elem use with HAVE_GEOIP
authorMark Andrews <marka@isc.org>
Thu, 1 May 2014 05:03:11 +0000 (15:03 +1000)
committerMark Andrews <marka@isc.org>
Thu, 1 May 2014 05:03:42 +0000 (15:03 +1000)
(cherry picked from commit c2638d3d5ab1fa10fde4026e92c5ffff23b77bdf)

lib/dns/acl.c

index 1064bce9a41e56c5693cbe57cab80f25bc63afe9..64cc08a7929c7f0127c9a07f80dbb629dac42e0a 100644 (file)
@@ -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) {