X-Git-Url: https://git.distorted.org.uk/~mdw/exim-config/blobdiff_plain/beb15dae3f15ff993556b44897bed035d543c683..534d411b5c96107030e30da491e06734ea09a7b3:/base.m4

diff --git a/base.m4 b/base.m4
index 4a925df..204be0a 100644
--- a/base.m4
+++ b/base.m4
@@ -351,6 +351,12 @@ SECTION(transports)m4_dnl
 ## `domains.conf' file.  Annoyingly, the `tls_dh_min_bits' setting isn't
 ## expanded before use, so we can't set it the obvious way.  Instead, encode
 ## it into the transport name.  This is very unpleasant, of course.
+smtp:
+	driver = smtp
+	tls_require_ciphers = CONF_acceptable_ciphers
+	tls_dh_min_bits = 1020
+	tls_tempfail_tryclear = true
+
 m4_define(<:SMTP_TRANS_DHBITS:>,
 	<:driver = smtp
 	hosts_try_auth = *
@@ -370,8 +376,6 @@ m4_define(<:SMTP_TRANS_DHBITS:>,
 		      {CONF_acceptable_ciphers})
 	tls_dh_min_bits = $1
 	tls_tempfail_tryclear = true:>)m4_dnl
-smtp:
-	SMTP_TRANS_DHBITS(1020)
 smtp_dhbits_1024:
 	SMTP_TRANS_DHBITS(1020)
 smtp_dhbits_2048: