From f50a3a803d19af29ca27e271b193cbddcad5f92e Mon Sep 17 00:00:00 2001 From: "Adam D. Barratt" Date: Mon, 14 Oct 2019 22:25:04 +0100 Subject: [PATCH] eximconf: include RBL response value in reject messages Signed-off-by: Adam D. Barratt --- modules/exim/templates/eximconf.erb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb index 6b055f9f1..af0e177a8 100644 --- a/modules/exim/templates/eximconf.erb +++ b/modules/exim/templates/eximconf.erb @@ -887,7 +887,7 @@ check_recipient: domains = +virtual_domains : +bsmtp_domains <%- unless @use_smarthost -%> - deny message = host $sender_host_address is listed in $dnslist_domain; see $dnslist_text + deny message = host $sender_host_address is listed in $dnslist_domain ($dnslist_value); see $dnslist_text dnslists = ${if match_domain{$domain}{+virtual_domains}\ {${if exists {${extract{directory}{VDOMAINDATA}{${value}/rbllist}}}\ {${lookup{$local_part}lsearch*{${extract{directory}{VDOMAINDATA}{${value}/rbllist}}}{$value}{}}}{}}}\ @@ -896,19 +896,19 @@ check_recipient: domains = +handled_domains !hosts = +debianhosts : WHITELIST - deny message = host $sender_host_address is listed in $dnslist_domain; see $dnslist_text + deny message = host $sender_host_address is listed in $dnslist_domain ($dnslist_value); see $dnslist_text dnslists = noserver.dnsbl.sorbs.net domains = +handled_domains !hosts = +debianhosts : WHITELIST - deny message = host $sender_host_address is listed in $dnslist_domain; see $dnslist_text + deny message = host $sender_host_address is listed in $dnslist_domain ($dnslist_value); see $dnslist_text condition = ${if bool_lax{HAS_DEFAULT_OPTIONS}} dnslists = relays.dnsbl.sorbs.net : xbl.spamhaus.org domains = +handled_domains !hosts = +debianhosts : WHITELIST <%- end -%> - deny message = domain $sender_address_domain is listed in $dnslist_domain; see $dnslist_text + deny message = domain $sender_address_domain is listed in $dnslist_domain ($dnslist_value); see $dnslist_text dnslists = ${if match_domain{$domain}{+virtual_domains}\ {${if exists {${extract{directory}{VDOMAINDATA}{${value}/rhsbllist}}}\ {${expand:${lookup{$local_part}lsearch*{${extract{directory}{VDOMAINDATA}{${value}/rhsbllist}}}{$value}{}}}}{}}}\ @@ -917,12 +917,12 @@ check_recipient: domains = +handled_domains !hosts = +debianhosts : WHITELIST - deny message = domain $sender_address_domain is listed in $dnslist_domain; see $dnslist_text + deny message = domain $sender_address_domain is listed in $dnslist_domain ($dnslist_value); see $dnslist_text dnslists = nomail.rhsbl.sorbs.net/$sender_address_domain domains = +handled_domains !hosts = +debianhosts : WHITELIST - deny message = domain $sender_address_domain is listed in $dnslist_domain; see $dnslist_text + deny message = domain $sender_address_domain is listed in $dnslist_domain ($dnslist_value); see $dnslist_text condition = ${if bool_lax{HAS_DEFAULT_OPTIONS}} dnslists = dbl.spamhaus.org/$sender_address_domain domains = +handled_domains -- 2.20.1