You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by do...@apache.org on 2006/10/04 00:56:23 UTC
svn commit: r452667 -
/spamassassin/branches/3.1/lib/Mail/SpamAssassin/EvalTests.pm
Author: dos
Date: Tue Oct 3 15:56:23 2006
New Revision: 452667
URL: http://svn.apache.org/viewvc?view=rev&rev=452667
Log:
bug 5080: fix bug in update RCVD_ILLEGAL_IP evaltest to properly deal with 127/8 fix
Modified:
spamassassin/branches/3.1/lib/Mail/SpamAssassin/EvalTests.pm
Modified: spamassassin/branches/3.1/lib/Mail/SpamAssassin/EvalTests.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.1/lib/Mail/SpamAssassin/EvalTests.pm?view=diff&rev=452667&r1=452666&r2=452667
==============================================================================
--- spamassassin/branches/3.1/lib/Mail/SpamAssassin/EvalTests.pm (original)
+++ spamassassin/branches/3.1/lib/Mail/SpamAssassin/EvalTests.pm Tue Oct 3 15:56:23 2006
@@ -3051,12 +3051,10 @@
foreach my $rcvd ( @{$self->{relays_untrusted}} ) {
# (note this might miss some hits if the Received.pm skips any invalid IPs)
foreach my $check ( $rcvd->{ip}, $rcvd->{by} ) {
- 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])
- )$/x);
+ next if ($check eq '127.0.0.1');
+ return 1 if ($check =~ /^
+ (?:[01257]|127|22[3-9]|23[0-9]|24[0-9]|25[0-5])\.\d+\.\d+\.\d+
+ $/x);
}
}
return 0;