svn commit: r729909 - /spamassassin/rules/branches/3.2/20_ratware.cf

[jm...@apache.org]

Author: jm
Date: Mon Dec 29 07:10:17 2008
New Revision: 729909

URL: http://svn.apache.org/viewvc?rev=729909&view=rev
Log:
bug 5496, bug 5962: fix FORGED_MUA_OUTLOOK false positives, using rule suggestion derived from Roger So and Yusuf Goolamabbas

Modified:
    spamassassin/rules/branches/3.2/20_ratware.cf

Modified: spamassassin/rules/branches/3.2/20_ratware.cf
URL: http://svn.apache.org/viewvc/spamassassin/rules/branches/3.2/20_ratware.cf?rev=729909&r1=729908&r2=729909&view=diff
==============================================================================
--- spamassassin/rules/branches/3.2/20_ratware.cf (original)
+++ spamassassin/rules/branches/3.2/20_ratware.cf Mon Dec 29 07:10:17 2008
@@ -61,9 +61,9 @@
 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
 header __OE_MSGID_2		MESSAGEID =~ /^<(?:[0-9a-f]{8}|[0-9a-f]{12})\$[0-9a-f]{8}\$[0-9a-f]{8}\@\S+>$/m
-header __OE_MSGID_3		MESSAGEID =~ /^<BAY\d+-DAV\d+[A-Z0-9]{25}\@phx\.gbl>$/m
+header __HOTMAIL_BAYDAV_MSGID         MESSAGEID =~ /^<[A-Z]{3}\d+-(?:DAV|SMTP)\d+[A-Z0-9]{25}\@phx\.gbl>$/m
 header __OE_MSGID_4		MESSAGEID =~ /^<BAYC\d+-PASMTP\d+[A-Z0-9]{25}\@CEZ\.ICE>$/m
-meta __FORGED_OE		(__OE_MUA && !__OE_MSGID_1 && !__OE_MSGID_2 && !__OE_MSGID_3 && !__OE_MSGID_4 && !__UNUSABLE_MSGID)
+meta __FORGED_OE		(__OE_MUA && !__OE_MSGID_1 && !__OE_MSGID_2 && !__HOTMAIL_BAYDAV_MSGID && !__OE_MSGID_4 && !__UNUSABLE_MSGID)
 
 # Outlook versions that usually use "dollar signs"
 header __OUTLOOK_DOLLARS_MUA	X-Mailer =~ /^Microsoft Outlook(?: 8| CWS, Build 9|, Build 10)\./