X-Git-Url: https://git.distorted.org.uk/~mdw/exim-config/blobdiff_plain/e90159689acef685dd341342f4697774a51c6a64..9a99b2d2a847c5d77f48ce8b731fb103c608825a:/base.m4

diff --git a/base.m4 b/base.m4
index cb0f7a6..eeb5fdb 100644
--- 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 \
-		   {; 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}}
 
@@ -452,9 +452,11 @@ smtp_local:
 	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: