X-Git-Url: https://git.distorted.org.uk/~mdw/exim-config/blobdiff_plain/5918499b6e7746f49aa8ba9ae1f058d2b48bda47..7b50997dc5e3447c61790f2eeb2cda34c0f3a229:/base.m4

diff --git a/base.m4 b/base.m4
index a00757e..e78194a 100644
--- a/base.m4
+++ b/base.m4
@@ -73,7 +73,13 @@ 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}} \
+		   {${if and {{def:authenticated_sender} \
+			      {match_address{$authenticated_sender} \
+					    {*@CONF_master_domain}}} \
+			 {; auth=${quote_local_part:\
+				    ${local_part:\
+				      $authenticated_sender}}}}}})\n\t}}\
 	id $message_exim_id\
 	${if def:received_for {\n\tfor $received_for}}
 
@@ -147,6 +153,7 @@ SECTION(acl, misc)m4_dnl
 not_smtp_start:
 	## Record the user's name.
 	warn	 set acl_c_user = $sender_ident
+		 set acl_m_user = $sender_ident
 
 	## Done.
 	accept
@@ -312,6 +319,10 @@ mail_check_auth:
 	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
 
@@ -407,7 +418,7 @@ smtp:
 	driver = smtp
 	APPLY_HEADER_CHANGES
 	tls_require_ciphers = CONF_acceptable_ciphers
-	tls_dh_min_bits = 1020
+	tls_dh_min_bits = 508
 	tls_tempfail_tryclear = true
 
 m4_define(<:SMTP_TRANS_DHBITS:>,
@@ -430,10 +441,14 @@ m4_define(<:SMTP_TRANS_DHBITS:>,
 		      {CONF_acceptable_ciphers})
 	tls_dh_min_bits = $1
 	tls_tempfail_tryclear = true:>)m4_dnl
+smtp_dhbits_512:
+	SMTP_TRANS_DHBITS(508)
+smtp_dhbits_768:
+	SMTP_TRANS_DHBITS(764)
 smtp_dhbits_1024:
 	SMTP_TRANS_DHBITS(1020)
 smtp_dhbits_2048:
-	SMTP_TRANS_DHBITS(2046)
+	SMTP_TRANS_DHBITS(2044)
 
 ## Transport to a local SMTP server; use TLS and perform client
 ## authentication.
@@ -447,9 +462,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: