summaryrefslogtreecommitdiff
path: root/conf.d
diff options
context:
space:
mode:
authorSystem administrator2019-10-14 00:23:39 +0200
committerSystem administrator2019-10-14 00:23:39 +0200
commitc3780e131fe1cf0f5712990f937eec47e262c994 (patch)
tree4556bea3e0c995bb1b8a50f1b35025e9eeeb8c25 /conf.d
parent4f37a4b254a1f547a355bd49ecce699702e70c54 (diff)
downloadexim-c3780e131fe1cf0f5712990f937eec47e262c994.tar.gz
acl: don't require valid ehlo for authenticated users
Diffstat (limited to 'conf.d')
-rw-r--r--conf.d/020_acl.conf6
1 files changed, 3 insertions, 3 deletions
diff --git a/conf.d/020_acl.conf b/conf.d/020_acl.conf
index 1ff3d1e..04a5e0a 100644
--- a/conf.d/020_acl.conf
+++ b/conf.d/020_acl.conf
@@ -14,9 +14,6 @@ acl_check_mail_introduction:
14 require condition = ${if def:sender_helo_name} 14 require condition = ${if def:sender_helo_name}
15 set acl_m_msg = HELO/EHLO command required. 15 set acl_m_msg = HELO/EHLO command required.
16 16
17 require verify = reverse_host_lookup/defer_ok
18 set acl_m_msg = HELO/EHLO lookup yielded mismatch.
19
20 accept 17 accept
21 18
22 19
@@ -99,6 +96,9 @@ acl_mta_mail:
99 require acl = acl_check_mail_introduction 96 require acl = acl_check_mail_introduction
100 message = Courtesy protocol violation: $acl_m_msg 97 message = Courtesy protocol violation: $acl_m_msg
101 98
99 require verify = reverse_host_lookup/defer_ok
100 message = HELO/EHLO mismatch.
101
102 accept hosts = +trusted_relay_hosts 102 accept hosts = +trusted_relay_hosts
103 103
104 defer spf = temperror 104 defer spf = temperror