Commit 96fc6dd8 authored by Julien Cristau's avatar Julien Cristau

Revert "eximconf: enable greylisting for users with default options"

Seems to break with "missing } at end of condition inside "or" group"

This reverts commit 08a19061.
parent cbab6f33
......@@ -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}{}}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment