mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 22:45:39 +00:00
Code Issues Releases Wiki Activity

[master] fix a problem with libgeoip 1.5 and higher

Browse Source 
3715.	[bug]		The region and city databases could fail to
			initialize when using some versions of libGeoIP,
			causing assertion failures when named was
			configured to use them. [RT #35427]
This commit is contained in:
Evan Hunt
2014-01-23 12:46:02 -08:00
parent db519a99ce
commit 83f69fcd6e
4 changed files with 79 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/dns/geoip.c
View File

@@ -655,8 +655,11 @@ dns_geoip_match(const isc_netaddr_t *reqaddr,
maxlen = 255;
getcountry:
db = DB46(reqaddr, geoip, country);
INSIST(db != NULL);
if (db == NULL)
return (ISC_FALSE);
INSIST(elt->as_string != NULL);
cs = country_lookup(db, subtype, reqaddr->family,
ipnum, ipnum6);
if (cs != NULL && strncasecmp(elt->as_string, cs, maxlen) == 0)
@@ -675,6 +678,9 @@ dns_geoip_match(const isc_netaddr_t *reqaddr,
INSIST(elt->as_string != NULL);
db = DB46(reqaddr, geoip, city);
if (db == NULL)
return (ISC_FALSE);
record = city_lookup(db, subtype,
reqaddr->family, ipnum, ipnum6);
if (record == NULL)
@@ -688,6 +694,9 @@ dns_geoip_match(const isc_netaddr_t *reqaddr,
case dns_geoip_city_metrocode:
db = DB46(reqaddr, geoip, city);
if (db == NULL)
return (ISC_FALSE);
record = city_lookup(db, subtype,
reqaddr->family, ipnum, ipnum6);
if (record == NULL)
@@ -699,6 +708,9 @@ dns_geoip_match(const isc_netaddr_t *reqaddr,
case dns_geoip_city_areacode:
db = DB46(reqaddr, geoip, city);
if (db == NULL)
return (ISC_FALSE);
record = city_lookup(db, subtype,
reqaddr->family, ipnum, ipnum6);
if (record == NULL)
@@ -711,7 +723,10 @@ dns_geoip_match(const isc_netaddr_t *reqaddr,
case dns_geoip_region_countrycode:
case dns_geoip_region_code:
case dns_geoip_region_name:
INSIST(geoip->region != NULL);
case dns_geoip_region:
if (geoip->region == NULL)
return (ISC_FALSE);
INSIST(elt->as_string != NULL);
/* Region DB is not supported for IPv6 */
@@ -744,7 +759,9 @@ dns_geoip_match(const isc_netaddr_t *reqaddr,
db = geoip->domain;
getname:
INSIST(db != NULL);
if (db == NULL)
return (ISC_FALSE);
INSIST(elt->as_string != NULL);
/* ISP, Org, AS, and Domain are not supported for IPv6 */
if (reqaddr->family == AF_INET6)