You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by gb...@apache.org on 2021/07/29 17:15:37 UTC
svn commit: r1891877 - /spamassassin/trunk/rules/60_whitelist_dkim.cf
Author: gbechis
Date: Thu Jul 29 17:15:37 2021
New Revision: 1891877
URL: http://svn.apache.org/viewvc?rev=1891877&view=rev
Log:
unbreak linter on older version
Modified:
spamassassin/trunk/rules/60_whitelist_dkim.cf
Modified: spamassassin/trunk/rules/60_whitelist_dkim.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/60_whitelist_dkim.cf?rev=1891877&r1=1891876&r2=1891877&view=diff
==============================================================================
--- spamassassin/trunk/rules/60_whitelist_dkim.cf (original)
+++ spamassassin/trunk/rules/60_whitelist_dkim.cf Thu Jul 29 17:15:37 2021
@@ -68,10 +68,10 @@ endif
# The order here may or may not be correct and should be checked
if (version >= 3.003000)
-ifplugin Mail::SpamAssassin::Plugin::DKIM
-
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
header USER_IN_DEF_DKIM_WL eval:check_for_def_dkim_welcomelist_from()
describe USER_IN_DEF_DKIM_WL From: address is in the default DKIM welcome-list
@@ -198,8 +198,12 @@ def_welcomelist_from_dkim *@fisglobal.co
def_welcomelist_from_dkim *@*.msgfocus.com
def_welcomelist_from_dkim *@boredpanda.com mailersend.com
+endif # Mail::SpamAssassin::Plugin::DKIM
+
else
+ifplugin Mail::SpamAssassin::Plugin::DKIM
+
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 welcome-list
tflags USER_IN_DEF_DKIM_WL nice noautolearn net
@@ -315,8 +319,8 @@ def_whitelist_from_dkim *@fisglobal.com
def_whitelist_from_dkim *@*.msgfocus.com
def_whitelist_from_dkim *@boredpanda.com mailersend.com
-endif # if can(Mail::SpamAssassin::Conf::feature_blocklist_welcomelist)
-
endif # Mail::SpamAssassin::Plugin::DKIM
+endif # if can(Mail::SpamAssassin::Conf::feature_blocklist_welcomelist)
+
endif # version >= 3.3.0