You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by fe...@apache.org on 2006/09/04 05:45:53 UTC
svn commit: r439916 -
/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/RelayEval.pm
Author: felicity
Date: Sun Sep 3 20:45:52 2006
New Revision: 439916
URL: http://svn.apache.org/viewvc?view=rev&rev=439916
Log:
bug 5080: update RCVD_ILLEGAL_IP evaltest to properly deal with 127/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?view=diff&rev=439916&r1=439915&r2=439916
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/RelayEval.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/RelayEval.pm Sun Sep 3 20:45:52 2006
@@ -102,11 +102,10 @@
foreach my $rcvd ( @{$pms->{relays_untrusted}} ) {
# (note this might miss some hits if the Received.pm skips any invalid IPs)
foreach my $check ( $rcvd->{ip}, $rcvd->{by} ) {
+ return 0 if ($check eq '127.0.0.1');
return 1 if ($check =~ /^(?:
- (?:[01257]|22[3-9]|23[0-9]|24[0-9]|25[0-5])\.\d+\.\d+\.\d+|
- 127\.[1-9]\.\d+\.\d+|
- 127\.0\.[1-9]\.\d+|
- 127\.0\.0\.(?:\d\d+|[2-9])
+ (?:
+ [01257]|127|22[3-9]|23[0-9]|24[0-9]|25[0-5])\.\d+\.\d+\.\d+
)$/x);
}
}