From 71a792f0aebc12b322dfc0acbd904ac413e6ae60 Mon Sep 17 00:00:00 2001
From: pacien
Date: Thu, 22 Aug 2019 09:40:38 +0200
Subject: acl: drop bad hosts conn with message

---
 conf.d/020_acl.conf | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/conf.d/020_acl.conf b/conf.d/020_acl.conf
index 6bfa6ae..c048b7d 100644
--- a/conf.d/020_acl.conf
+++ b/conf.d/020_acl.conf
@@ -42,7 +42,7 @@ acl_check_rcpt_host_policy:
 
   # Deny messages from hosts known to be bad.
   drop     dnslists      = sbl-xbl.spamhaus.org : bl.spamcop.net
-           set acl_m_msg = [RBL] $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text
+           message       = [RBL] $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text
 
   # Accept if the host is an authorized sender according to the SPF policy for the domain (SPF pass).
   accept   set acl_m_spf = ${run{SPF_QUERY_COMMAND \
@@ -54,7 +54,7 @@ acl_check_rcpt_host_policy:
 
   # Deny if the host is explicitely not an authorized sender according to the SPF policy for the domain (SPF fail).
   drop     condition     = ${if eq {$acl_m_spf}{1}{yes}{no}}
-           set acl_m_msg = [SPF] $sender_host_address is not allowed to send mail from \
+           message       = [SPF] $sender_host_address is not allowed to send mail from \
                            ${if def:sender_address_domain {$sender_address_domain}{$sender_helo_name}}. \
                            Please see http://www.openspf.org/Why?scope=${if def:sender_address_domain \
                              {mfrom}{helo}};identity=${if def:sender_address_domain \
@@ -62,7 +62,7 @@ acl_check_rcpt_host_policy:
 
   # Deny messages from hosts listed as non-MTA in the PBL, for which SPF couldn't determine a policy.
   drop     dnslists      = pbl.spamhaus.org
-           set acl_m_msg = [RBL] $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text
+           message       = [RBL] $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text
 
   accept
 
@@ -115,7 +115,6 @@ acl_mta_rcpt:
            message       = Courtesy protocol violation: $acl_m_msg
 
   require  acl           = acl_check_rcpt_host_policy
-           message       = $acl_m_msg
 
   require  acl           = acl_check_rcpt_syntax
            message       = Syntactic validation failed: $acl_m_msg
-- 
cgit v1.2.3