You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by mm...@apache.org on 2009/08/13 18:07:35 UTC
svn commit: r803940 -
/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/RelayEval.pm
Author: mmartinec
Date: Thu Aug 13 16:07:35 2009
New Revision: 803940
URL: http://svn.apache.org/viewvc?rev=803940&view=rev
Log:
Bug 5878: IPV4_ADDRESS regexp matches ip.ad.dr.in-addr.arpa format
(attempting a fix; do we have any tests for this?)
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=803940&r1=803939&r2=803940&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/RelayEval.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/RelayEval.pm Thu Aug 13 16:07:35 2009
@@ -87,7 +87,9 @@
if ($rcvd) {
my $IP_ADDRESS = IPV4_ADDRESS;
my $IP_PRIVATE = IP_PRIVATE;
- if ($rcvd =~ /helo=($IP_ADDRESS)\b/i && $1 !~ /$IP_PRIVATE/) {
+ local $1;
+ if ($rcvd =~ /\bhelo=($IP_ADDRESS)(?=[\000-\040,;\[()<>]|\z)/i # Bug 5878
+ && $1 !~ /$IP_PRIVATE/) {
return 1;
}
}