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

diff --git a/base.m4 b/base.m4
index cb0f7a6..f8b09e4 100644
--- a/base.m4
+++ b/base.m4
@@ -59,6 +59,8 @@ gecos_name = $1
 gecos_pattern = ([^,:]*)
 
 SECTION(global, incoming)m4_dnl
+rfc1413_hosts = *
+rfc1413_query_timeout = 10s
 received_header_text = Received: \
 	${if def:sender_rcvhost \
 	     {from $sender_rcvhost\n\t} \
@@ -73,13 +75,20 @@ 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}}
 
 SECTION(global, smtp)m4_dnl
 smtp_return_error_details = true
 accept_8bitmime = true
+chunking_advertise_hosts =
 
 SECTION(global, env)m4_dnl
 keep_environment =
@@ -96,7 +105,7 @@ SECTION(global, bounce)m4_dnl
 delay_warning = 1h : 24h : 2d
 
 SECTION(global, tls)m4_dnl
-tls_certificate = CONF_sysconf_dir/server.certlist
+tls_certificate = CONF_certlist
 tls_privatekey = CONF_sysconf_dir/server.key
 tls_advertise_hosts = ${if exists {CONF_sysconf_dir/server.key} {*}{}}
 tls_dhparam = CONF_ca_dir/dh-param-2048.pem
@@ -116,6 +125,10 @@ SECTION(global, acl)m4_dnl
 acl_smtp_helo = helo
 SECTION(acl, misc)m4_dnl
 helo:
+	## Don't worry if this is local submission.  MUAs won't necessarily
+	## have a clear idea of their hostnames.  (For some reason.)
+	accept	 condition = ${if !eq{$acl_c_mode}{submission}}
+
 	## Check that the caller's claimed identity is actually plausible.
 	## This seems like it's a fairly effective filter on spamminess, but
 	## it's too blunt a tool.  Rather than reject, add a warning header.
@@ -230,6 +243,7 @@ check_submission:
 
 	## Remember to apply submission controls.
 	warn	 set acl_c_mode = submission
+		 control = no_enforce_sync
 
 	## Done.
 	accept
@@ -255,17 +269,17 @@ check_relay:
 	## we're the correct place to send this mail.
 
 	## Known clients and authenticated users are OK.
-	accept	  hosts = CONF_relay_clients
-	accept	  authenticated = *
+	accept	 hosts = CONF_relay_clients
+	accept	 authenticated = *
 
 	## Known domains are OK.
-	accept	  domains = +public
+	accept	 domains = +public
 
 	## Finally, domains in our table are OK, unless they say they aren't.
-	accept	  domains = \
-		${if exists{CONF_sysconf_dir/domains.conf} \
+	accept	 domains = \
+		 ${if exists{CONF_sysconf_dir/domains.conf} \
 		     {partial0-lsearch;	CONF_sysconf_dir/domains.conf}}
-		  condition = DOMKV(service, {$value}{true})
+		 condition = DOMKV(service, {$value}{true})
 
 	## Nope, that's not allowed.
 	deny
@@ -278,6 +292,10 @@ SECTION(global, acl)m4_dnl
 acl_smtp_data = data
 SECTION(acl, data)m4_dnl
 data:
+	## Don't accept messages with overly-long lines.
+	deny	 message = line length exceeds SMTP permitted maximum: \
+			$max_received_linelength > 998
+		 condition = ${if >{$max_received_linelength}{998}}
 
 SECTION(acl, data-tail)m4_dnl
 	accept
@@ -401,6 +419,11 @@ m4_define(<:APPLY_HEADER_CHANGES:>,
 		<:${if def:acl_m_hdrrm{$acl_m_hdrrm:}}\
 		$2:>):>)
 
+m4_define(<:SMTP_DELIVERY:>,
+	<:## Prevent sending messages with overly long lines.  The use of
+	## `message_size_limit' here is somewhat misleading.
+	message_size_limit = ${if >{$max_received_linelength}{998}{1}{0}}:>)
+
 SECTION(transports)m4_dnl
 ## A standard transport for remote delivery.  By default, try to do TLS, and
 ## don't worry too much if it's not very secure: the alternative is sending
@@ -412,11 +435,12 @@ 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:>,
 	<:driver = smtp
+	SMTP_DELIVERY
 	APPLY_HEADER_CHANGES
 	hosts_try_auth = *
 	hosts_require_tls = DOMKV(tls-peer-ca, {*}{})
@@ -435,15 +459,20 @@ 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.
 smtp_local:
 	driver = smtp
+	SMTP_DELIVERY
 	APPLY_HEADER_CHANGES
 	hosts_require_tls = *
 	tls_certificate = CONF_sysconf_dir/client.certlist
@@ -452,9 +481,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:
@@ -501,6 +532,13 @@ DIVERT(null)
 ### Retry configuration.
 
 SECTION(retry, default)m4_dnl
+## Be persistent when sending to the site relay.  It ought to work, but
+## particularly satellites such as laptops often encounter annoying temporary
+## failures due to network unavailability, and the usual gradual policy can
+## leave mail building up for no good reason.
+CONF_smarthost				* \
+	F,4d,15m
+
 ## Default.
 *					* \
 	F,2h,15m; G,16h,2h,1.5; F,4d,6h