You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jh...@apache.org on 2010/04/27 21:53:23 UTC
svn commit: r938622 - /spamassassin/trunk/rulesrc/sandbox/hege/20_hk.cf
Author: jhardin
Date: Tue Apr 27 19:53:23 2010
New Revision: 938622
URL: http://svn.apache.org/viewvc?rev=938622&view=rev
Log:
add !SPF_PASS to HK_FAKENAME_MICROSOFT per bug 6417 (temporarily at least)
Modified:
spamassassin/trunk/rulesrc/sandbox/hege/20_hk.cf
Modified: spamassassin/trunk/rulesrc/sandbox/hege/20_hk.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/hege/20_hk.cf?rev=938622&r1=938621&r2=938622&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/hege/20_hk.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/hege/20_hk.cf Tue Apr 27 19:53:23 2010
@@ -41,8 +41,11 @@ describe HK_SUBJECT_SPACES_SC Lots of sp
header __HK_NAME_MICROSOFT From:name =~ /(microsoft|\bmsn\b)/i
header __HK_HELO_MICROSOFT X-Spam-Relays-External =~ / helo=\S+\.(?:microsoft(?:email)?|msn)\.com /
-meta HK_FAKENAME_MICROSOFT __HK_NAME_MICROSOFT && !__HK_HELO_MICROSOFT
-describe HK_FAKENAME_MICROSOFT From name mentions Microsoft, but not relayed from there
+# false hits per bug 6417
+ifplugin Mail::SpamAssassin::Plugin::SPF
+ meta HK_FAKENAME_MICROSOFT __HK_NAME_MICROSOFT && !__HK_HELO_MICROSOFT && !SPF_PASS
+ describe HK_FAKENAME_MICROSOFT From name mentions Microsoft, but not relayed from there
+endif
header __HK_NAME_YAHOO From:name =~ /\byahoo\b/i
header __HK_HELO_YAHOO X-Spam-Relays-External =~ / helo=[^ ]+\.yahoo\.com /