mmartinec at apache
Nov 2, 2009, 8:19 AM
Post #1 of 1
(82 views)
Permalink
|
|
svn commit: r831941 - in /spamassassin/trunk/rules: 25_dkim.cf 60_whitelist_dkim.cf
|
|
Author: mmartinec
Date: Mon Nov 2 16:19:45 2009
New Revision: 831941
URL: http://svn.apache.org/viewvc?rev=831941&view=rev
Log:
25_dkim.cf, 60_whitelist_dkim.cf: remove tflags userconf from
some DKIM rules, partly reverting my r818926 - the flag was
added due to my misunderstanding of userconf flag; actually
these rules only need </gen:mutable> in the 50_scores.cf
Modified:
spamassassin/trunk/rules/25_dkim.cf
spamassassin/trunk/rules/60_whitelist_dkim.cf
Modified: spamassassin/trunk/rules/25_dkim.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/25_dkim.cf?rev=831941&r1=831940&r2=831941&view=diff
==============================================================================
--- spamassassin/trunk/rules/25_dkim.cf (original)
+++ spamassassin/trunk/rules/25_dkim.cf Mon Nov 2 16:19:45 2009
@@ -42,17 +42,16 @@
# Note: DKIM_SIGNED, DKIM_VALID and DKIM_VALID_AU are mainly informational
# rules, and can serve as a basis for meta rules; it is not difficult for a
# sender to cause hits on them or to prevent them from firing, so their score
-# should be kept low. These are "userconf" so that scores are set by hand.
-tflags DKIM_SIGNED net userconf
-tflags DKIM_VALID net userconf nice
-tflags DKIM_VALID_AU net userconf nice
-tflags __DKIM_DEPENDABLE net
+# should be kept low.
+tflags DKIM_SIGNED net
+tflags DKIM_VALID net nice
+tflags DKIM_VALID_AU net nice
tflags DKIM_ADSP_NXDOMAIN net
tflags DKIM_ADSP_DISCARD net
tflags DKIM_ADSP_ALL net
-tflags DKIM_ADSP_CUSTOM_LOW net
-tflags DKIM_ADSP_CUSTOM_MED net
-tflags DKIM_ADSP_CUSTOM_HIGH net
+tflags DKIM_ADSP_CUSTOM_LOW net userconf
+tflags DKIM_ADSP_CUSTOM_MED net userconf
+tflags DKIM_ADSP_CUSTOM_HIGH net userconf
describe DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid
describe DKIM_VALID Message has at least one valid DKIM or DK signature
@@ -86,9 +85,9 @@
header DKIM_POLICY_TESTING eval:check_dkim_testing()
header DKIM_POLICY_SIGNSOME eval:check_dkim_signsome()
header DKIM_POLICY_SIGNALL eval:check_dkim_signall()
-tflags DKIM_VERIFIED net nice userconf
-tflags DKIM_POLICY_SIGNSOME net nice userconf
-tflags DKIM_POLICY_SIGNALL net nice userconf
-tflags DKIM_POLICY_TESTING net nice userconf
+tflags DKIM_VERIFIED net nice
+tflags DKIM_POLICY_SIGNSOME net nice
+tflags DKIM_POLICY_SIGNALL net nice
+tflags DKIM_POLICY_TESTING net nice
endif # Mail::SpamAssassin::Plugin::DKIM
Modified: spamassassin/trunk/rules/60_whitelist_dkim.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/60_whitelist_dkim.cf?rev=831941&r1=831940&r2=831941&view=diff
==============================================================================
--- spamassassin/trunk/rules/60_whitelist_dkim.cf (original)
+++ spamassassin/trunk/rules/60_whitelist_dkim.cf Mon Nov 2 16:19:45 2009
@@ -28,11 +28,11 @@
header USER_IN_DKIM_WHITELIST eval:check_for_dkim_whitelist_from()
describe USER_IN_DKIM_WHITELIST From: address is in the user's DKIM whitelist
-tflags USER_IN_DKIM_WHITELIST userconf nice noautolearn net
+tflags USER_IN_DKIM_WHITELIST nice noautolearn net userconf
header USER_IN_DEF_DKIM_WL eval:check_for_def_dkim_whitelist_from()
describe USER_IN_DEF_DKIM_WL From: address is in the default DKIM white-list
-tflags USER_IN_DEF_DKIM_WL userconf nice noautolearn net
+tflags USER_IN_DEF_DKIM_WL nice noautolearn net
###########################################################################
# Default whitelists. These should be addresses which send mail that is often
|
