From 534d411b5c96107030e30da491e06734ea09a7b3 Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Tue, 25 Mar 2014 11:48:54 +0000 Subject: [PATCH] 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. --- base.m4 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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: -- 2.11.0