You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by gb...@apache.org on 2020/11/20 07:33:00 UTC
svn commit: r1883660 -
/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URILocalBL.pm
Author: gbechis
Date: Fri Nov 20 07:33:00 2020
New Revision: 1883660
URL: http://svn.apache.org/viewvc?rev=1883660&view=rev
Log:
fix GeoIP open_type call, bz #7871
Modified:
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URILocalBL.pm
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URILocalBL.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URILocalBL.pm?rev=1883660&r1=1883659&r2=1883660&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URILocalBL.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URILocalBL.pm Fri Nov 20 07:33:00 2020
@@ -480,14 +480,14 @@ sub check_uri_local_bl {
my $flags = 0;
my $flag_isp = 0;
my $flag_silent = 0;
- eval '$flags = GEOIP_MEMORY_CACHE | GEOIP_CHECK_CACHE' if ($gip_wanted >= $gip_have);
- eval '$flag_silent = Geo::IP::GEOIP_SILENCE' if ($gip_wanted >= $gip_have);
- eval '$flag_isp = GEOIP_ISP_EDITION' if ($gip_wanted >= $gip_have);
+ eval '$flags = GEOIP_MEMORY_CACHE | GEOIP_CHECK_CACHE' if ($gip_have >= $gip_wanted);
+ eval '$flag_silent = GEOIP_SILENCE' if ($gip_have >= $gip_wanted);
+ eval '$flag_isp = GEOIP_ISP_EDITION' if ($gip_have >= $gip_wanted);
eval {
- if ($flag_silent && $gic_wanted >= $gic_have) {
+ if ($flag_silent && $gic_have >= $gic_wanted) {
$self->{geoip} = Geo::IP->new($flags | $flag_silent);
- $self->{geoisp} = Geo::IP->open_type($flag_isp | $flag_silent | $flags);
+ $self->{geoisp} = Geo::IP->open_type($flag_isp, $flag_silent | $flags);
} else {
open(OLDERR, ">&STDERR");
open(STDERR, ">", "/dev/null");