~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
cb0f7a6
..
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}}
@@
-452,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: