8b9eaf3e02
This is fixed in master, but we want to backport it for now. https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7871 Signed-off-by: Kevin Fenzi <kevin@scrye.com>
23 lines
1.2 KiB
Diff
23 lines
1.2 KiB
Diff
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URILocalBL.pm 2020/11/20 06:45:02 1883659
|
|
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URILocalBL.pm 2020/11/20 07:33:00 1883660
|
|
@@ -480,14 +480,14 @@
|
|
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");
|