You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2006/07/13 17:41:27 UTC

svn commit: r421650 - /spamassassin/rules/trunk/sandbox/dos/70_bugs.cf

Author: jm
Date: Thu Jul 13 08:41:26 2006
New Revision: 421650

URL: http://svn.apache.org/viewvc?rev=421650&view=rev
Log:
renamed __HAS_OUTLOOK_IN_MAILER to __HAS_OUTLOOK_IN_MAILER_NEW, to avoid collision with existing rule

Modified:
    spamassassin/rules/trunk/sandbox/dos/70_bugs.cf

Modified: spamassassin/rules/trunk/sandbox/dos/70_bugs.cf
URL: http://svn.apache.org/viewvc/spamassassin/rules/trunk/sandbox/dos/70_bugs.cf?rev=421650&r1=421649&r2=421650&view=diff
==============================================================================
--- spamassassin/rules/trunk/sandbox/dos/70_bugs.cf (original)
+++ spamassassin/rules/trunk/sandbox/dos/70_bugs.cf Thu Jul 13 08:41:26 2006
@@ -86,13 +86,14 @@
 
 ## Dallas' comment #3
 # catches a few spams missed by MSGID_OUTLOOK_INVALID
-header __HAS_OUTLOOK_IN_MAILER	X-Mailer =~ /\bMSCRM\b|Microsoft (?:CDO|Outlook|Office Outlook)\b/
+# jm: updated to avoid collision with existing rule
+header __HAS_OUTLOOK_IN_MAILER_NEW	X-Mailer =~ /\bMSCRM\b|Microsoft (?:CDO|Outlook|Office Outlook)\b/
 header __LIST_UNSUB		List-Unsubscribe =~ /\S/
 header __LIST_GENERIC		Mailing-List =~ /\S/
 
 #  __MAILMAN_21 is from 20_ratware.cf
 meta __LIST_MAIL	(__LIST_UNSUB || __LIST_GENERIC || __MAILMAN_21)
-meta T_MSGID_DOLLARS	(__OUTLOOK_DOLLARS_MSGID && !__LIST_MAIL && !__HAS_OUTLOOK_IN_MAILER && !__UNUSABLE_MSGID)
+meta T_MSGID_DOLLARS	(__OUTLOOK_DOLLARS_MSGID && !__LIST_MAIL && !__HAS_OUTLOOK_IN_MAILER_NEW && !__UNUSABLE_MSGID)
 
 
 ## Justin's comment #11 copied from http://www.emailaddresses.com/forum/showthread.php?s=&threadid=42287