From 96fc6dd8d6625ce75f39c71fa2353b611fb008dd Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Sat, 12 Oct 2019 22:03:07 +0200 Subject: [PATCH] Revert "eximconf: enable greylisting for users with default options" Seems to break with "missing } at end of condition inside "or" group" This reverts commit 08a1906121670d960592fbbf6ec489ff54c8b64c. --- modules/exim/templates/eximconf.erb | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb index bb7c7566c..10038ade4 100644 --- a/modules/exim/templates/eximconf.erb +++ b/modules/exim/templates/eximconf.erb @@ -781,11 +781,7 @@ check_recipient: defer message = $sender_host_address is not yet authorized to deliver mail from <$sender_address> to <$local_part@$domain>. log_message = greylisted. - condition = ${if or { \ - {match_local_part{$local_part}{GREYLIST_LOCAL_PARTS}} \ - {HAS_DEFAULT_OPTIONS} \ - } \ - } + local_parts = GREYLIST_LOCAL_PARTS !senders = : !hosts = : +debianhosts : WHITELIST : \ ${if exists {/etc/greylistd/whitelist-hosts}\ @@ -819,11 +815,7 @@ check_recipient: condition = ${if !eq {$acl_m_prf}{PopconMail}} !authenticated = * domains = +handled_domains - condition = ${if or { \ - {match_local_part{$local_part}{GREYLIST_LOCAL_PARTS}} \ - {HAS_DEFAULT_OPTIONS} \ - } \ - } + local_parts = GREYLIST_LOCAL_PARTS set acl_m_pgr = request=smtpd_access_policy\n\ protocol_state=RCPT\n\ protocol_name=${uc:$received_protocol}\n\ @@ -848,11 +840,7 @@ check_recipient: condition = ${if !eq {$acl_m_prf}{PopconMail}} !authenticated = * domains = +handled_domains - condition = ${if or { \ - {match_local_part{$local_part}{GREYLIST_LOCAL_PARTS}} \ - {HAS_DEFAULT_OPTIONS} \ - } \ - } + local_parts = GREYLIST_LOCAL_PARTS condition = ${if eq{${uc:${substr_0_7:$acl_m_pgr}}}{PREPEND}} message = ${sg{$acl_m_pgr}{\N^\w+\s*\N}{}} -- 2.20.1