From: Mark Andrews <marka@isc.org>
Date: Sun, 28 Sep 2014 23:32:59 +0000 (+1000)
Subject: don't redefine GEOIP_DATA
X-Git-Tag: v9.11.0a1~1378^2~14
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=4b92bc0022dca038223e39f14b58d21867332ed6;p=thirdparty%2Fbind9.git

don't redefine GEOIP_DATA
---

diff --git a/lib/dns/tests/geoip_test.c b/lib/dns/tests/geoip_test.c
index 60994d2ce94..8ada41bbdb4 100644
--- a/lib/dns/tests/geoip_test.c
+++ b/lib/dns/tests/geoip_test.c
@@ -34,7 +34,7 @@
 #include <GeoIP.h>
 
 /* We use GeoIP databases from the 'geoip' system test */
-#define GEOIP_DATA "../../../bin/tests/system/geoip/data"
+#define TEST_GEOIP_DATA "../../../bin/tests/system/geoip/data"
 
 /*
  * Helper functions
@@ -206,7 +206,7 @@ ATF_TC_BODY(country, tc) {
 	ATF_REQUIRE(result == ISC_R_SUCCESS);
 
 	/* Use databases from the geoip system test */
-	load_geoip(GEOIP_DATA);
+	load_geoip(TEST_GEOIP_DATA);
 
 	if (geoip.country_v4 == NULL) {
 		dns_test_end();
@@ -257,7 +257,7 @@ ATF_TC_BODY(country_v6, tc) {
 	ATF_REQUIRE(result == ISC_R_SUCCESS);
 
 	/* Use databases from the geoip system test */
-	load_geoip(GEOIP_DATA);
+	load_geoip(TEST_GEOIP_DATA);
 
 	if (geoip.country_v6 == NULL) {
 		dns_test_end();
@@ -297,7 +297,7 @@ ATF_TC_BODY(city, tc) {
 	ATF_REQUIRE(result == ISC_R_SUCCESS);
 
 	/* Use databases from the geoip system test */
-	load_geoip(GEOIP_DATA);
+	load_geoip(TEST_GEOIP_DATA);
 
 	if (geoip.city_v4 == NULL) {
 		dns_test_end();
@@ -360,7 +360,7 @@ ATF_TC_BODY(city_v6, tc) {
 	ATF_REQUIRE(result == ISC_R_SUCCESS);
 
 	/* Use databases from the geoip system test */
-	load_geoip(GEOIP_DATA);
+	load_geoip(TEST_GEOIP_DATA);
 
 	if (geoip.city_v6 == NULL) {
 		dns_test_end();
@@ -419,7 +419,7 @@ ATF_TC_BODY(region, tc) {
 	ATF_REQUIRE(result == ISC_R_SUCCESS);
 
 	/* Use databases from the geoip system test */
-	load_geoip(GEOIP_DATA);
+	load_geoip(TEST_GEOIP_DATA);
 
 	if (geoip.region == NULL) {
 		dns_test_end();
@@ -461,7 +461,7 @@ ATF_TC_BODY(best, tc) {
 	ATF_REQUIRE(result == ISC_R_SUCCESS);
 
 	/* Use databases from the geoip system test */
-	load_geoip(GEOIP_DATA);
+	load_geoip(TEST_GEOIP_DATA);
 
 	if (geoip.region == NULL) {
 		dns_test_end();
@@ -541,7 +541,7 @@ ATF_TC_BODY(asnum, tc) {
 	ATF_REQUIRE(result == ISC_R_SUCCESS);
 
 	/* Use databases from the geoip system test */
-	load_geoip(GEOIP_DATA);
+	load_geoip(TEST_GEOIP_DATA);
 
 	if (geoip.as == NULL) {
 		dns_test_end();
@@ -571,7 +571,7 @@ ATF_TC_BODY(isp, tc) {
 	ATF_REQUIRE(result == ISC_R_SUCCESS);
 
 	/* Use databases from the geoip system test */
-	load_geoip(GEOIP_DATA);
+	load_geoip(TEST_GEOIP_DATA);
 
 	if (geoip.isp == NULL) {
 		dns_test_end();
@@ -600,7 +600,7 @@ ATF_TC_BODY(org, tc) {
 	ATF_REQUIRE(result == ISC_R_SUCCESS);
 
 	/* Use databases from the geoip system test */
-	load_geoip(GEOIP_DATA);
+	load_geoip(TEST_GEOIP_DATA);
 
 	if (geoip.org == NULL) {
 		dns_test_end();
@@ -629,7 +629,7 @@ ATF_TC_BODY(domain, tc) {
 	ATF_REQUIRE(result == ISC_R_SUCCESS);
 
 	/* Use databases from the geoip system test */
-	load_geoip(GEOIP_DATA);
+	load_geoip(TEST_GEOIP_DATA);
 
 	if (geoip.domain == NULL) {
 		dns_test_end();
@@ -658,7 +658,7 @@ ATF_TC_BODY(netspeed, tc) {
 	ATF_REQUIRE(result == ISC_R_SUCCESS);
 
 	/* Use databases from the geoip system test */
-	load_geoip(GEOIP_DATA);
+	load_geoip(TEST_GEOIP_DATA);
 
 	if (geoip.netspeed == NULL) {
 		dns_test_end();