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 2021/08/07 09:05:03 UTC
svn commit: r1892060 - in /spamassassin/trunk/rules: 60_whitelist_auth.cf
60_whitelist_dkim.cf
Author: hege
Date: Sat Aug 7 09:05:03 2021
New Revision: 1892060
URL: http://svn.apache.org/viewvc?rev=1892060&view=rev
Log:
Bug 7919, fix some more if-if-else bugs
Modified:
spamassassin/trunk/rules/60_whitelist_auth.cf
spamassassin/trunk/rules/60_whitelist_dkim.cf
Modified: spamassassin/trunk/rules/60_whitelist_auth.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/60_whitelist_auth.cf?rev=1892060&r1=1892059&r2=1892060&view=diff
==============================================================================
--- spamassassin/trunk/rules/60_whitelist_auth.cf (original)
+++ spamassassin/trunk/rules/60_whitelist_auth.cf Sat Aug 7 09:05:03 2021
@@ -24,10 +24,6 @@
###########################################################################
# SPF and DKIM whitelist rules
-if (version >= 3.003000)
-
-ifplugin Mail::SpamAssassin::Plugin::SPF
-
if can(Mail::SpamAssassin::Conf::feature_blocklist_welcomelist)
###########################################################################
@@ -1998,6 +1994,3 @@ def_whitelist_auth *@*.verintefm.com
endif # if can(Mail::SpamAssassin::Conf::feature_blocklist_welcomelist)
-endif # Mail::SpamAssassin::Plugin::SPF
-
-endif # version >= 3.3.0
Modified: spamassassin/trunk/rules/60_whitelist_dkim.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/60_whitelist_dkim.cf?rev=1892060&r1=1892059&r2=1892060&view=diff
==============================================================================
--- spamassassin/trunk/rules/60_whitelist_dkim.cf (original)
+++ spamassassin/trunk/rules/60_whitelist_dkim.cf Sat Aug 7 09:05:03 2021
@@ -65,11 +65,8 @@ else
endif
-# The order here may or may not be correct and should be checked
-if (version >= 3.003000)
if can(Mail::SpamAssassin::Conf::feature_blocklist_welcomelist)
-
ifplugin Mail::SpamAssassin::Plugin::DKIM
# The backwards compatibility for this rule will be after the else statement below
@@ -200,8 +197,14 @@ def_welcomelist_from_dkim *@boredpanda.c
endif # Mail::SpamAssassin::Plugin::DKIM
-else
+
+
+#
+# For older versions of SA, these old entries remain for SA before version 4.0
+#
+
+else
ifplugin Mail::SpamAssassin::Plugin::DKIM
header USER_IN_DEF_DKIM_WL eval:check_for_def_dkim_whitelist_from()
@@ -209,8 +212,6 @@ describe USER_IN_DEF_DKIM_WL From: addre
tflags USER_IN_DEF_DKIM_WL nice noautolearn net
reuse USER_IN_DEF_DKIM_WL
-#For older versions of SA, these old entries remain for SA before version 4.0
-
def_whitelist_from_dkim *@*.ebay.com ebay.com
def_whitelist_from_dkim *@ebay.com
def_whitelist_from_dkim *@ebay.co.uk
@@ -320,7 +321,5 @@ def_whitelist_from_dkim *@*.msgfocus.com
def_whitelist_from_dkim *@boredpanda.com mailersend.com
endif # Mail::SpamAssassin::Plugin::DKIM
-
endif # if can(Mail::SpamAssassin::Conf::feature_blocklist_welcomelist)
-endif # version >= 3.3.0