You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by mm...@apache.org on 2009/11/21 02:03:14 UTC

svn commit: r882811 - /spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_bl.cf

Author: mmartinec
Date: Sat Nov 21 01:03:14 2009
New Revision: 882811

URL: http://svn.apache.org/viewvc?rev=882811&view=rev
Log:
hacked 20_khop_bl.cf, looks like the 'mkrules' does not understand an 'else' !?

Modified:
    spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_bl.cf

Modified: spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_bl.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_bl.cf?rev=882811&r1=882810&r2=882811&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_bl.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_bl.cf Sat Nov 21 01:03:14 2009
@@ -5,18 +5,17 @@
 # (warren's work has already covered most of what I'd add here)
 
 ifplugin Mail::SpamAssassin::Plugin::SPF
-  ifplugin Mail::SpamAssassin::Plugin::DKIM
+# ifplugin Mail::SpamAssassin::Plugin::DKIM
     meta   __NOT_SPOOFED       ALL_TRUSTED || SPF_PASS || DKIM_VERIFIED
-  else
-    meta   __NOT_SPOOFED       ALL_TRUSTED || SPF_PASS
-  endif
+# else
+#   meta   __NOT_SPOOFED       ALL_TRUSTED || SPF_PASS
+# endif
 else
-  ifplugin Mail::SpamAssassin::Plugin::DKIM
+# ifplugin Mail::SpamAssassin::Plugin::DKIM
     meta   __NOT_SPOOFED       ALL_TRUSTED || DKIM_VERIFIED
-  else
-    # Neither DKIM nor SPF ... ugh.  Approximate by looking for just the header.
-    header __DKIM_EXISTS        exists:DKIM-Signature
-    meta   __NOT_SPOOFED       ALL_TRUSTED || __DKIM_EXISTS
-  endif
+# else
+#   # Neither DKIM nor SPF ... ugh.  Approximate by looking for just the header.
+#   header __DKIM_EXISTS        exists:DKIM-Signature
+#   meta   __NOT_SPOOFED       ALL_TRUSTED || __DKIM_EXISTS
+# endif
 endif
-