base.m4: Simplify the bare `smtp' router.

It's no longer generated with the `SMTP_TRANS_DHBITS' macro.  Since it's
only used when the recipient domain is unknown, the various tunable
parameters are never actually tuned.

This has another happy effect: it bodges around Exim bug #1413.

diff --git a/base.m4 b/base.m4
index 4a925df..204be0a 100644 (file)
--- 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: