You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by qu...@apache.org on 2004/10/27 02:40:52 UTC

svn commit: rev 55652 - spamassassin/branches/3.0/rules

Author: quinlan
Date: Tue Oct 26 17:40:51 2004
New Revision: 55652

Modified:
   spamassassin/branches/3.0/rules/20_head_tests.cf
Log:
bug 3928: trivial rule fix for MSCRM


Modified: spamassassin/branches/3.0/rules/20_head_tests.cf
==============================================================================
--- spamassassin/branches/3.0/rules/20_head_tests.cf	(original)
+++ spamassassin/branches/3.0/rules/20_head_tests.cf	Tue Oct 26 17:40:51 2004
@@ -116,6 +116,7 @@
 describe MSGID_OUTLOOK_INVALID	Message-Id is fake (in Outlook Express format)
 
 # catches a few spams missed by MSGID_OUTLOOK_INVALID
+header __HAS_OUTLOOK_IN_MAILER	X-Mailer =~ /\bMSCRM\b|Microsoft (?:CDO|Outlook|Office Outlook)\b/
 meta MSGID_DOLLARS		(__OUTLOOK_DOLLARS_MSGID && !__HAS_OUTLOOK_IN_MAILER && !__UNUSABLE_MSGID)
 describe MSGID_DOLLARS		Message-Id has pattern used in spam
 
@@ -396,7 +397,6 @@
 describe MISSING_MIMEOLE	Message has X-MSMail-Priority, but no X-MimeOLE
 
 header __HAS_X_MAILER		exists:X-Mailer
-header __HAS_OUTLOOK_IN_MAILER	X-Mailer =~ /Microsoft (CDO|Outlook|Office Outlook)\b/
 
 header __IS_EXCH		X-MimeOLE =~ /Produced By Microsoft Exchange V/