You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2022/04/17 16:47:12 UTC
svn commit: r1899955 - in /spamassassin/branches/trunk-welcomelist/rules: 50_scores.cf 60_welcomelist_spf.cf
Author: hege
Date: Sun Apr 17 16:47:12 2022
New Revision: 1899955
URL: http://svn.apache.org/viewvc?rev=1899955&view=rev
Log:
Move SPF welcomelist scores
Modified:
spamassassin/branches/trunk-welcomelist/rules/50_scores.cf
spamassassin/branches/trunk-welcomelist/rules/60_welcomelist_spf.cf
Modified: spamassassin/branches/trunk-welcomelist/rules/50_scores.cf
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/rules/50_scores.cf?rev=1899955&r1=1899954&r2=1899955&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/rules/50_scores.cf (original)
+++ spamassassin/branches/trunk-welcomelist/rules/50_scores.cf Sun Apr 17 16:47:12 2022
@@ -721,8 +721,8 @@ score USER_IN_ALL_SPAM_TO -100.000
endif
ifplugin Mail::SpamAssassin::Plugin::SPF
-score USER_IN_SPF_WELCOMELIST -0.01
-score USER_IN_SPF_WHITELIST -100.000
+#score USER_IN_SPF_WELCOMELIST -0.01 - Moved to 60_welcomelist_spf.cf
+#score USER_IN_SPF_WHITELIST -100.000 - Moved to 60_welcomelist_spf.cf
score USER_IN_DEF_SPF_WL -7.500
score ENV_AND_HDR_SPF_MATCH -0.5
endif # Mail::SpamAssassin::Plugin::SPF
Modified: spamassassin/branches/trunk-welcomelist/rules/60_welcomelist_spf.cf
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/rules/60_welcomelist_spf.cf?rev=1899955&r1=1899954&r2=1899955&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/rules/60_welcomelist_spf.cf (original)
+++ spamassassin/branches/trunk-welcomelist/rules/60_welcomelist_spf.cf Sun Apr 17 16:47:12 2022
@@ -31,11 +31,13 @@ if can(Mail::SpamAssassin::Conf::feature
header USER_IN_SPF_WELCOMELIST eval:check_for_spf_welcomelist_from()
describe USER_IN_SPF_WELCOMELIST From: address is in the user's SPF welcomelist
tflags USER_IN_SPF_WELCOMELIST userconf nice noautolearn net
+ score USER_IN_SPF_WELCOMELIST -0.01
reuse USER_IN_SPF_WELCOMELIST
meta USER_IN_SPF_WHITELIST (USER_IN_SPF_WELCOMELIST)
describe USER_IN_SPF_WHITELIST DEPRECATED: See USER_IN_SPF_WELCOMELIST
tflags USER_IN_SPF_WHITELIST userconf nice noautolearn net
+ score USER_IN_SPF_WHITELIST -100
reuse USER_IN_SPF_WHITELIST
header USER_IN_DEF_SPF_WL eval:check_for_def_spf_welcomelist_from()
@@ -47,11 +49,13 @@ if !can(Mail::SpamAssassin::Conf::featur
header USER_IN_SPF_WELCOMELIST eval:check_for_spf_whitelist_from()
describe USER_IN_SPF_WELCOMELIST From: address is in the user's SPF welcomelist
tflags USER_IN_SPF_WELCOMELIST userconf nice noautolearn net
+ score USER_IN_SPF_WELCOMELIST -0.01
reuse USER_IN_SPF_WELCOMELIST
meta USER_IN_SPF_WHITELIST (USER_IN_SPF_WELCOMELIST)
describe USER_IN_SPF_WHITELIST DEPRECATED: See USER_IN_SPF_WELCOMELIST
tflags USER_IN_SPF_WHITELIST userconf nice noautolearn net
+ score USER_IN_SPF_WHITELIST -100
reuse USER_IN_SPF_WHITELIST
header USER_IN_DEF_SPF_WL eval:check_for_def_spf_whitelist_from()