You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by km...@apache.org on 2020/07/20 01:45:05 UTC
svn commit: r1880056 - in /spamassassin/trunk/rules: 50_scores.cf
60_whitelist.cf
Author: kmcgrail
Date: Mon Jul 20 01:45:05 2020
New Revision: 1880056
URL: http://svn.apache.org/viewvc?rev=1880056&view=rev
Log:
More Tweaking to USER_IN_WELCOMELIST_TO
Modified:
spamassassin/trunk/rules/50_scores.cf
spamassassin/trunk/rules/60_whitelist.cf
Modified: spamassassin/trunk/rules/50_scores.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/50_scores.cf?rev=1880056&r1=1880055&r2=1880056&view=diff
==============================================================================
--- spamassassin/trunk/rules/50_scores.cf (original)
+++ spamassassin/trunk/rules/50_scores.cf Mon Jul 20 01:45:05 2020
@@ -712,7 +712,7 @@ score HEADER_HOST_IN_WHITELIST -100.0
# not really false positives but the user wants spam!
#bz7826 renames whitelist to welcomelist
-score USER_IN_WELCOMELIST_TO -6.000
+#score USER_IN_WELCOMELIST_TO -6.000 - Moved to 60_whitelist.cf
score USER_IN_MORE_SPAM_TO -20.000
score USER_IN_ALL_SPAM_TO -100.000
endif
Modified: spamassassin/trunk/rules/60_whitelist.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/60_whitelist.cf?rev=1880056&r1=1880055&r2=1880056&view=diff
==============================================================================
--- spamassassin/trunk/rules/60_whitelist.cf (original)
+++ spamassassin/trunk/rules/60_whitelist.cf Mon Jul 20 01:45:05 2020
@@ -49,13 +49,20 @@ tflags USER_IN_BLACKLIST_TO userconf
if can(Mail::SpamAssassin::Conf::feature_blocklist_welcomelist)
#bz7826 renames whitelist to welcomelist
- header USER_IN_WELCOMELIST_TO eval:check_to_in_welcomelist()
- describe USER_IN_WELCOMELIST_TO User is listed in 'welcomelist_to'
- tflags USER_IN_WELCOMELIST_TO userconf nice noautolearn
+ header USER_IN_WELCOMELIST_TO eval:check_to_in_welcomelist()
+ describe USER_IN_WELCOMELIST_TO User is listed in 'welcomelist_to'
+ tflags USER_IN_WELCOMELIST_TO userconf nice noautolearn
+ score USER_IN_WELCOMELIST_TO -6.0
else
- header USER_IN_WELCOMELIST_TO eval:check_to_in_whitelist()
- describe USER_IN_WELCOMELIST_TO User is listed in 'whitelist_to'
- tflags USER_IN_WELCOMELIST_TO userconf nice noautolearn
+ header USER_IN_WELCOMELIST_TO eval:check_to_in_whitelist()
+ describe USER_IN_WELCOMELIST_TO User is listed in 'welcomelist_to'
+ tflags USER_IN_WELCOMELIST_TO userconf nice noautolearn
+ score USER_IN_WELCOMELIST_TO -0.01
+
+ meta USER_IN_WHITELIST_TO (USER_IN_WELCOMELIST_TO)
+ describe USER_IN_WHITELIST_TO DEPRECATED: See USER_IN_WELCOMELIST_TO
+ tflags USER_IN_WHITELIST_TO userconf nice noautolearn
+ score USER_IN_WHITELIST_TO -6.0
endif
header USER_IN_MORE_SPAM_TO eval:check_to_in_more_spam()