~mdw
/
exim-config
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
base.m4: Quote the `auth=...' name, in case it has bad characters.
[exim-config]
/
base.m4
diff --git
a/base.m4
b/base.m4
index
63d001c
..
eeb5fdb
100644
(file)
--- a/
base.m4
+++ b/
base.m4
@@
-73,7
+73,7
@@
received_header_text = Received: \
${if def:sender_address \
{(envelope-from $sender_address\
${if def:authenticated_id \
${if def:sender_address \
{(envelope-from $sender_address\
${if def:authenticated_id \
- {; auth=$
authenticated_id
}})\n\t}}\
+ {; auth=$
{quote_local_part:$authenticated_id}
}})\n\t}}\
id $message_exim_id\
${if def:received_for {\n\tfor $received_for}}
id $message_exim_id\
${if def:received_for {\n\tfor $received_for}}
@@
-81,6
+81,9
@@
SECTION(global, smtp)m4_dnl
smtp_return_error_details = true
accept_8bitmime = true
smtp_return_error_details = true
accept_8bitmime = true
+SECTION(global, env)m4_dnl
+keep_environment =
+
SECTION(global, process)m4_dnl
extract_addresses_remove_arguments = false
headers_charset = utf-8
SECTION(global, process)m4_dnl
extract_addresses_remove_arguments = false
headers_charset = utf-8
@@
-144,6
+147,7
@@
SECTION(acl, misc)m4_dnl
not_smtp_start:
## Record the user's name.
warn set acl_c_user = $sender_ident
not_smtp_start:
## Record the user's name.
warn set acl_c_user = $sender_ident
+ set acl_m_user = $sender_ident
## Done.
accept
## Done.
accept
@@
-309,6
+313,10
@@
mail_check_auth:
deny message = Sender not authenticated
condition = ${if !def:acl_c_user}
deny message = Sender not authenticated
condition = ${if !def:acl_c_user}
+ ## Set the per-message authentication flag, since we now know that
+ ## there's a sensible value.
+ warn set acl_m_user = $acl_c_user
+
## All done.
accept
## All done.
accept
@@
-444,9
+452,11
@@
smtp_local:
tls_require_ciphers = CONF_good_ciphers
tls_dh_min_bits = 2046
tls_tempfail_tryclear = false
tls_require_ciphers = CONF_good_ciphers
tls_dh_min_bits = 2046
tls_tempfail_tryclear = false
- authenticated_sender = ${if def:authenticated_id \
- {$authenticated_id@CONF_master_domain} \
- fail}
+ authenticated_sender_force = true
+ authenticated_sender = \
+ ${if def:acl_m_user {$acl_m_user@CONF_master_domain} \
+ {${if def:authenticated_sender {$authenticated_sender} \
+ fail}}}
## A standard transport for local delivery.
deliver:
## A standard transport for local delivery.
deliver: