byterazor/qpsmtpd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #237 from smtpd/revert-236-geoip-crash

Browse Source 
Revert "Don't crash QP when GeoIP data is missing"
This commit is contained in:
Jared Johnson 2015-02-26 17:06:23 -06:00
commit 8cb7f8b226
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/ident/geoip
View File

@ -327,11 +327,8 @@ sub open_geoip_db {
# can't think of a good reason to load country if city data is present
if (!$self->{_geoip_city}) {
$self->log(LOGDEBUG, "using default db");
eval { $self->{_geoip} = Geo::IP->new(); }; # loads default Country DB
if (!$self->{_geoip}) {
my $err = $@ || 'Unknown error';
warn "Missing GeoIP Country data:$err\n";
}
$self->{_geoip} = Geo::IP->new(); # loads default Country DB
warn "Missing GeoIP Country data!\n" if ! $self->{_geoip};
}
}