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 2018/06/20 17:16:33 UTC
svn commit: r1833929 - in /spamassassin:
branches/3.4/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm
trunk/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm
Author: gbechis
Date: Wed Jun 20 17:16:33 2018
New Revision: 1833929
URL: http://svn.apache.org/viewvc?rev=1833929&view=rev
Log:
silence a warning if GeoIP v6 database is not installed
but a v6 address is on relay headers
Modified:
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm
spamassassin/trunk/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=1833929&r1=1833928&r2=1833929&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm Wed Jun 20 17:16:33 2018
@@ -163,7 +163,11 @@ sub extract_metadata {
# Private IPs will always be returned as '**'
if ( $conf_country_db_type eq "GeoIP" ) {
if ( $ip !~ /^$IPV4_ADDRESS$/o ) {
- $geo = $dbv6->country_code_by_addr_v6($ip) || "XX";
+ if ( defined $dbv6 ) {
+ $geo = $dbv6->country_code_by_addr_v6($ip) || "XX";
+ } else {
+ $geo = "XX";
+ }
} else {
$geo = $db->country_code_by_addr($ip) || "XX";
}
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm?rev=1833929&r1=1833928&r2=1833929&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm Wed Jun 20 17:16:33 2018
@@ -163,7 +163,11 @@ sub extract_metadata {
# Private IPs will always be returned as '**'
if ( $conf_country_db_type eq "GeoIP" ) {
if ( $ip !~ /^$IPV4_ADDRESS$/o ) {
- $geo = $dbv6->country_code_by_addr_v6($ip) || "XX";
+ if ( defined $dbv6 ) {
+ $geo = $dbv6->country_code_by_addr_v6($ip) || "XX";
+ } else {
+ $geo = "XX";
+ }
} else {
$geo = $db->country_code_by_addr($ip) || "XX";
}