X-Git-Url: https://git.distorted.org.uk/~mdw/exim-config/blobdiff_plain/d411be33f6b1fe489a40a4566ee5b7073326075c..60c96a7cf779c92c393d0d666a8b530ae69dbd6d:/exchange.m4

diff --git a/exchange.m4 b/exchange.m4
index 00f0b05..e7d5fa4 100644
--- a/exchange.m4
+++ b/exchange.m4
@@ -31,7 +31,7 @@ SECTION(global, tls)m4_dnl
 tls_certificate = CONF_sysconf_dir/server.cert
 tls_privatekey = CONF_sysconf_dir/server.key
 tls_advertise_hosts = *
-tls_dhparam = CONF_ca_dir/dh-param.pem
+tls_dhparam = CONF_ca_dir/dh-param-2048.pem
 tls_require_ciphers = ${if or {{={$received_port}{CONF_submission_port}} \
 			       {match_ip {$sender_host_address}{+trusted}}} \
 			   {CONF_good_ciphers} \
@@ -47,12 +47,6 @@ SECTION(acl, mail-hooks)m4_dnl
 	## Check that a submitted message's sender address is allowable.
 	require	 acl = mail_client_addr
 
-	## Insist that a local client connect through TLS.
-	deny	 message = Hosts within CONF_master_domain must use TLS
-		!condition = ${if eq{$acl_c_mode}{submission}}
-		 hosts = +allnets
-		!encrypted = *
-
 SECTION(acl, misc)m4_dnl
 mail_client_addr:
 
@@ -73,7 +67,9 @@ mail_client_addr:
 		 add_header = :after_received:X-Distorted-Warning: \
 			RCLNTLSNDR \
 			Apparently local sender, but received from remote \
-			server.
+			server.\n\t\
+			sender=$sender_address \
+			host=$sender_host_address
 
 	## OK.
 	accept