From 61a8fcdc10780c7b33c559f90bdba390788a4a8f Mon Sep 17 00:00:00 2001 From: lnedry Date: Sun, 2 May 2021 10:29:23 -0400 Subject: [PATCH 1/2] Update Esp.cf The only time a test rule uses a score is when the score is set to zero to disable the rule. --- Esp.cf | 1 - 1 file changed, 1 deletion(-) diff --git a/Esp.cf b/Esp.cf index 2490ddd..4746948 100644 --- a/Esp.cf +++ b/Esp.cf @@ -71,7 +71,6 @@ sendgrid_domains_feed /etc/mail/spamassassin/sendgrid-envelopefromdomain-dnsbl.t header __SPBL_SENDGRID eval:esp_sendgrid_check() describe __SPBL_SENDGRID Message from Sendgrid abused account -score __SPBL_SENDGRID 5.0 # -------- SENDGRID - OR THIS -------- From 7550365cd2e793546a16022041a3e3bc3e0d4fc6 Mon Sep 17 00:00:00 2001 From: lnedry Date: Sun, 2 May 2021 10:32:15 -0400 Subject: [PATCH 2/2] Update Esp.cf The RBL_SENDGRID rule is never checked if the AskDNS plugin is not enabled. --- Esp.cf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Esp.cf b/Esp.cf index 2490ddd..7b09e0d 100644 --- a/Esp.cf +++ b/Esp.cf @@ -94,12 +94,12 @@ ifplugin Mail::SpamAssassin::Plugin::AskDNS tflags __RBL_SENDGRID_DOM net endif +endif # Mail::SpamAssassin::Plugin::AskDNS + meta RBL_SENDGRID (__RBL_SENDGRID_ID || __RBL_SENDGRID_DOM || __SPBL_SENDGRID) describe RBL_SENDGRID Invaluement Sendgrid blacklist score RBL_SENDGRID 5.0 -endif # Mail::SpamAssassin::Plugin::AskDNS - # -------- SENDINBLUE -------- sendinblue_feed /etc/mail/spamassassin/sendinblue_id.txt