svn commit: r560034 - /spamassassin/trunk/rules/20_ratware.cf

[si...@apache.org]

Author: sidney
Date: Thu Jul 26 16:55:55 2007
New Revision: 560034

URL: http://svn.apache.org/viewvc?view=rev&rev=560034
Log:
allow for new message id format we have seen from Vista or Windows 2003 Server MAPI

Modified:
    spamassassin/trunk/rules/20_ratware.cf

Modified: spamassassin/trunk/rules/20_ratware.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/20_ratware.cf?view=diff&rev=560034&r1=560033&r2=560034
==============================================================================
--- spamassassin/trunk/rules/20_ratware.cf (original)
+++ spamassassin/trunk/rules/20_ratware.cf Thu Jul 26 16:55:55 2007
@@ -54,6 +54,9 @@
 meta FORGED_MUA_IMS		(__IMS_MUA && !__IMS_MSGID && !__UNUSABLE_MSGID)
 describe FORGED_MUA_IMS		Forged mail pretending to be from IMS
 
+# Message ID format introduced by Vista MAPI, maybe also Windows 2003 Server SP2
+header __VISTA_MSGID		MESSAGEID =~ /^<[A-F\d]{32}\@\S+>$/m
+
 # Outlook Express 4, 5, and 6
 header __OE_MUA			X-Mailer =~ /\bOutlook Express [456]\./
 header __OE_MSGID_1		MESSAGEID =~ /^<[A-Za-z0-9-]{7}[A-Za-z0-9]{20}\@hotmail\.com>$/m
@@ -64,7 +67,7 @@
 # Outlook versions that usually use "dollar signs"
 header __OUTLOOK_DOLLARS_MUA	X-Mailer =~ /^Microsoft Outlook(?: 8| CWS, Build 9|, Build 10)\./
 header __OUTLOOK_DOLLARS_OTHER	MESSAGEID =~ /^<\!\~\!/m
-meta __FORGED_OUTLOOK_DOLLARS	(__OUTLOOK_DOLLARS_MUA && !__OE_MSGID_2 && !__OUTLOOK_DOLLARS_OTHER && !__IMS_MSGID && !__UNUSABLE_MSGID)
+meta __FORGED_OUTLOOK_DOLLARS	(__OUTLOOK_DOLLARS_MUA && !__OE_MSGID_2 && !__OUTLOOK_DOLLARS_OTHER && !__VISTA_MSGID && !__IMS_MSGID && !__UNUSABLE_MSGID)
 
 # use new meta rules to implement FORGED_MUA_OUTLOOK rule from 2.60
 meta FORGED_MUA_OUTLOOK		(__FORGED_OE || __FORGED_OUTLOOK_DOLLARS)