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 2021/01/07 02:26:23 UTC
svn commit: r1885222 - /spamassassin/trunk/rules/20_vbounce.cf
Author: kmcgrail
Date: Thu Jan 7 02:26:23 2021
New Revision: 1885222
URL: http://svn.apache.org/viewvc?rev=1885222&view=rev
Log:
Added better plugin check for vbounce and vbounce ruleset
Modified:
spamassassin/trunk/rules/20_vbounce.cf
Modified: spamassassin/trunk/rules/20_vbounce.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/20_vbounce.cf?rev=1885222&r1=1885221&r2=1885222&view=diff
==============================================================================
--- spamassassin/trunk/rules/20_vbounce.cf (original)
+++ spamassassin/trunk/rules/20_vbounce.cf Thu Jan 7 02:26:23 2021
@@ -48,17 +48,19 @@
#
###########################################################################
-ifplugin Mail::SpamAssassin::Plugin::VBounce
-
if can(Mail::SpamAssassin::Conf::feature_blocklist_welcomelist)
- body __MY_SERVERS_FOUND eval:check_welcomelist_bounce_relays()
+ ifplugin Mail::SpamAssassin::Plugin::VBounce
+ body __MY_SERVERS_FOUND eval:check_welcomelist_bounce_relays()
+ endif
else
- body __MY_SERVERS_FOUND eval:check_whitelist_bounce_relays()
+ ifplugin Mail::SpamAssassin::Plugin::VBounce
+ body __MY_SERVERS_FOUND eval:check_whitelist_bounce_relays()
+ endif
endif
-body __HAVE_BOUNCE_RELAYS eval:have_any_bounce_relays()
+ifplugin Mail::SpamAssassin::Plugin::VBounce
-endif
+body __HAVE_BOUNCE_RELAYS eval:have_any_bounce_relays()
# ---------------------------------------------------------------------------
# General bounce messages
@@ -333,3 +335,4 @@ describe VBOUNCE_MESSAGE Virus-scanne
meta ANY_BOUNCE_MESSAGE (CRBOUNCE_MESSAGE||BOUNCE_MESSAGE||VBOUNCE_MESSAGE||OOOBOUNCE_MESSAGE)
describe ANY_BOUNCE_MESSAGE Message is some kind of bounce message
+endif