You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2019/07/05 12:07:13 UTC
svn commit: r1862608 -
/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm
Author: hege
Date: Fri Jul 5 12:07:13 2019
New Revision: 1862608
URL: http://svn.apache.org/viewvc?rev=1862608&view=rev
Log:
Fix handling when geoip not loaded
Modified:
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm?rev=1862608&r1=1862607&r2=1862608&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm Fri Jul 5 12:07:13 2019
@@ -313,7 +313,10 @@ sub extract_metadata {
}
}
- return 1 unless $db;
+ if (!$db) {
+ $self->{relaycountry_disabled} = 1;
+ return 1;
+ }
dbg("metadata: RelayCountry: Using database: ".$db_info->());
my $msg = $opts->{msg};
@@ -375,6 +378,8 @@ sub extract_metadata {
sub parsed_metadata {
my ($self, $opts) = @_;
+ return 1 if $self->{relaycountry_disabled};
+
my @c_list = split(' ',
$opts->{permsgstatus}->get_message->get_metadata('X-Relay-Countries'));
$opts->{permsgstatus}->set_tag("RELAYCOUNTRY",