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/08/10 16:08:10 UTC
svn commit: r1864886 -
/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URILocalBL.pm
Author: hege
Date: Sat Aug 10 16:08:10 2019
New Revision: 1864886
URL: http://svn.apache.org/viewvc?rev=1864886&view=rev
Log:
Fail more gracefully if missing Net::CIDR::Lite
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=1864886&r1=1864885&r2=1864886&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URILocalBL.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URILocalBL.pm Sat Aug 10 16:08:10 2019
@@ -104,7 +104,6 @@ use Mail::SpamAssassin::Logger;
use Mail::SpamAssassin::Constants qw(:ip);
use Mail::SpamAssassin::Util qw(untaint_var);
-use Net::CIDR::Lite;
use Socket;
use strict;
@@ -117,6 +116,7 @@ our @ISA = qw(Mail::SpamAssassin::Plugin
use constant HAS_GEOIP => eval { require Geo::IP; };
use constant HAS_GEOIP2 => eval { require GeoIP2::Database::Reader; };
+use constant HAS_CIDR => eval { require Net::CIDR::Lite; };
# constructor
sub new {
@@ -277,6 +277,11 @@ sub set_config {
code => sub {
my ($self, $key, $value, $line) = @_;
+ if (!HAS_CIDR) {
+ warn "config: uri_block_cidr not supported, required module Net::CIDR::Lite missing\n";
+ return $Mail::SpamAssassin::Conf::INVALID_VALUE;
+ }
+
if ($value !~ /^(\S+)\s+(.+)$/) {
return $Mail::SpamAssassin::Conf::INVALID_VALUE;
}