mmartinec at apache
Nov 19, 2009, 9:32 AM
Post #1 of 1
(216 views)
Permalink
|
|
svn commit: r882213 - /spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/RelayEval.pm
|
|
Author: mmartinec
Date: Thu Nov 19 17:32:32 2009
New Revision: 882213
URL: http://svn.apache.org/viewvc?rev=882213&view=rev
Log:
Bug 6237 - RCVD_ILLEGAL_IP with ip 2.0.0.0/8 (and 223.0.0.0/8)
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/RelayEval.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/RelayEval.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/RelayEval.pm?rev=882213&r1=882212&r2=882213&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/RelayEval.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/RelayEval.pm Thu Nov 19 17:32:32 2009
@@ -101,9 +101,11 @@
foreach my $rcvd ( @{$pms->{relays_untrusted}} ) {
# (note this might miss some hits if the Received.pm skips any invalid IPs)
+ # do we really want to chase the more recent IANA allocations?
+ # check: http://www.iana.org/assignments/ipv4-address-space/
foreach my $check ( $rcvd->{ip}, $rcvd->{by} ) {
return 1 if ($check =~ /^
- (?:[01257]|22[3-9]|2[3-9]\d|[12]\d{3,}|[3-9]\d\d+)\.\d+\.\d+\.\d+
+ (?:[0157]|22[4-9]|2[3-9]\d|[12]\d{3,}|[3-9]\d\d+) \.\d+\.\d+\.\d+
$/x);
}
}
|
