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/18 16:48:26 UTC
svn commit: r1899995 - /spamassassin/branches/trunk-welcomelist/rules/60_shortcircuit.cf
Author: hege
Date: Mon Apr 18 16:48:26 2022
New Revision: 1899995
URL: http://svn.apache.org/viewvc?rev=1899995&view=rev
Log:
if(welcome) not needed for priorities
Modified:
spamassassin/branches/trunk-welcomelist/rules/60_shortcircuit.cf
Modified: spamassassin/branches/trunk-welcomelist/rules/60_shortcircuit.cf
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/rules/60_shortcircuit.cf?rev=1899995&r1=1899994&r2=1899995&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/rules/60_shortcircuit.cf (original)
+++ spamassassin/branches/trunk-welcomelist/rules/60_shortcircuit.cf Mon Apr 18 16:48:26 2022
@@ -27,27 +27,18 @@
###########################################################################
-if can(Mail::SpamAssassin::Conf::feature_welcomelist_blocklist)
- priority USER_IN_WELCOMELIST -1000
- priority USER_IN_DEF_WELCOMELIST -1000
-endif
-if !can(Mail::SpamAssassin::Conf::feature_welcomelist_blocklist)
- priority USER_IN_WHITELIST -1000
- priority USER_IN_DEF_WHITELIST -1000
-endif
-
-priority USER_IN_ALL_SPAM_TO -1000
-
-priority ALL_TRUSTED -950
-
-if can(Mail::SpamAssassin::Conf::feature_welcomelist_blocklist)
- priority USER_IN_BLOCKLIST_TO -900
- priority USER_IN_BLOCKLIST -900
-endif
-if !can(Mail::SpamAssassin::Conf::feature_welcomelist_blocklist)
- priority USER_IN_BLACKLIST_TO -900
- priority USER_IN_BLACKLIST -900
-endif
+priority USER_IN_WELCOMELIST -1000
+priority USER_IN_WHITELIST -1000
+priority USER_IN_DEF_WELCOMELIST -1000
+priority USER_IN_DEF_WHITELIST -1000
+priority USER_IN_ALL_SPAM_TO -1000
+
+priority ALL_TRUSTED -950
+
+priority USER_IN_BLOCKLIST_TO -900
+priority USER_IN_BLOCKLIST -900
+priority USER_IN_BLACKLIST_TO -900
+priority USER_IN_BLACKLIST -900
###########################################################################