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 2007/12/24 14:42:42 UTC
svn commit: r606699 -
/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm
Author: mmartinec
Date: Mon Dec 24 05:42:41 2007
New Revision: 606699
URL: http://svn.apache.org/viewvc?rev=606699&view=rev
Log:
DKIM: prefer SpamAssassin's parsing of From over Mail::DKIM/Mail::Address
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm?rev=606699&r1=606698&r2=606699&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm Mon Dec 24 05:42:41 2007
@@ -335,10 +335,13 @@
my $author = $verifier->message_originator;
$author = !$author ? '' : $author->address();
+ # Mail::DKIM sometimes leaves leading or trailing whitespace in address
+ $author =~ s/^[ \t]+//s; $author =~ s/[ \t]+\z//s; # trim
if ($author ne $scan->{dkim_author_address}) {
- info("dkim: author parsing inconsistency? SA:<%s>, DKIM:<%s>",
- $author, $scan->{dkim_author_address});
- $scan->{dkim_author_address} = $author;
+ dbg("dkim: author parsing inconsistency, SA: <%s>, DKIM: <%s>",
+ $author, $scan->{dkim_author_address});
+ # currently SpamAssassin's parsing is better than Mail::Address parsing
+ # $scan->{dkim_author_address} = $author;
}
$scan->{dkim_signatures} = [];