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 2007/04/10 23:26:57 UTC

svn commit: r527306 - /spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm

Author: dos
Date: Tue Apr 10 14:26:56 2007
New Revision: 527306

URL: http://svn.apache.org/viewvc?view=rev&rev=527306
Log:
make sure we don't use an unknown identity as a mfrom identity... just like I wrote in the POD

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm?view=diff&rev=527306&r1=527305&r2=527306
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm Tue Apr 10 14:26:56 2007
@@ -332,7 +332,7 @@
 
 	# http://www.openspf.org/RFC_4408#header-field
 	# wtf - for some reason something is sticking an extra space between the header name and field value
-	if ($hdr =~ /^received-spf:\s+(pass|neutral|(?:soft)?fail|none)\b(?:.*\bidentity=(helo|m(?:ail)?from)\b)?/i) {
+	if ($hdr =~ /^received-spf:\s+(pass|neutral|(?:soft)?fail|none)\b(?:.*\bidentity=(\S+?);?\b)?/i) {
 	  my $result = lc($1);
 
 	  my $identity = '';	# we assume it's a mfrom check if we can't tell otherwise