~mdw
/
exim-config
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
auth.m4: Report the message's authenticated sender at `DATA' time.
[exim-config]
/
base.m4
diff --git
a/base.m4
b/base.m4
index
63d001c
..
cb0f7a6
100644
(file)
--- a/
base.m4
+++ b/
base.m4
@@
-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