svn commit: rev 6164 - incubator/spamassassin/trunk/lib/Mail/SpamAssassin

[fe...@apache.org]

Author: felicity
Date: Tue Jan 13 21:54:21 2004
New Revision: 6164

Modified:
   incubator/spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm
Log:
bug 2569: MSGID_FROM_MTA_SHORT was FPing on certain postfix received 
headers due to its reliance on what old Postfix versions did.  updated to
be more accurate although the hit rate goes down.


Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm	(original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm	Tue Jan 13 21:54:21 2004
@@ -344,8 +344,8 @@
   # Postfix adds the Message-ID on the second local hop.  Note: this is not
   # an exemption, this is a special case to classify these hits correctly.
   if ($#received > 0 &&
-      $received[$#received] =~ /\(Postfix.*?\)/i &&
-      $received[$#received - 1] =~ /\(Postfix.*?\)/i)
+      $received[$#received] =~ /\[127\.0\.0\.1\].+\(Postfix.*?\)/i &&
+      $received[$#received - 1] =~ /\(Postfix, from userid \d+\)/i)
   {
     $local = 2;
   }