You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by do...@apache.org on 2006/11/24 05:49:14 UTC

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

Author: dos
Date: Thu Nov 23 20:49:13 2006
New Revision: 478768

URL: http://svn.apache.org/viewvc?view=rev&rev=478768
Log:
bug 4678: avoid some RATWARE_MS_HASH and RATWARE_OUTLOOK_NONAME FPs

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=478768&r1=478767&r2=478768
==============================================================================
--- spamassassin/trunk/rules/20_ratware.cf (original)
+++ spamassassin/trunk/rules/20_ratware.cf Thu Nov 23 20:49:13 2006
@@ -273,13 +273,15 @@
 header RATWARE_RCVD_AT		Received =~ / by \S+\@\S+ with Microsoft SMTPSVC/
 describe RATWARE_RCVD_AT	Bulk email fingerprint (Received @) found
 
-meta RATWARE_OUTLOOK_NONAME	__MSGID_DOLLARS_OK && !__HAS_X_MAILER
+header __RCVD_WITH_EXCHANGE	Received =~ /with Microsoft Exchange Server/
+
+meta RATWARE_OUTLOOK_NONAME	__MSGID_DOLLARS_OK && !__HAS_X_MAILER && !__RCVD_WITH_EXCHANGE
 describe RATWARE_OUTLOOK_NONAME	Bulk email fingerprint (Outlook no name) found
 
 
 
 header __MIMEOLE_MS		X-MIMEOLE =~ /^Produced By Microsoft MimeOLE/
-meta RATWARE_MS_HASH 		__MSGID_DOLLARS_OK && !__MIMEOLE_MS
+meta RATWARE_MS_HASH 		__MSGID_DOLLARS_OK && !__MIMEOLE_MS && !__RCVD_WITH_EXCHANGE
 describe RATWARE_MS_HASH	Bulk email fingerprint (msgid ms hash) found
 
 ###########################################################################