~mdw
/
exim-config
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
base.m4: Simplify the bare `smtp' router.
[exim-config]
/
base.m4
diff --git
a/base.m4
b/base.m4
index
523e475
..
204be0a
100644
(file)
--- a/
base.m4
+++ b/
base.m4
@@
-348,9
+348,17
@@
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
## in plaintext anyway. But all of this can be overridden from the
## 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
## in plaintext anyway. But all of this can be overridden from the
-## `domains.conf' file.
+## `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
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 = *
hosts_require_tls = DOMKV(tls-peer-ca, {*}{})
hosts_require_auth = \
hosts_try_auth = *
hosts_require_tls = DOMKV(tls-peer-ca, {*}{})
hosts_require_auth = \
@@
-366,10
+374,12
@@
smtp:
{$value} \
{${expand:$value}}}} \
{CONF_acceptable_ciphers})
{$value} \
{${expand:$value}}}} \
{CONF_acceptable_ciphers})
- ## Can't set this to an expansion. :-(
- m4_dnl tls_dh_min_bits = DOMKV(dh-min-bits, {$value}{1020})
- tls_dh_min_bits = 1020
- tls_tempfail_tryclear = true
+ tls_dh_min_bits = $1
+ tls_tempfail_tryclear = true:>)m4_dnl
+smtp_dhbits_1024:
+ SMTP_TRANS_DHBITS(1020)
+smtp_dhbits_2048:
+ SMTP_TRANS_DHBITS(2046)
## Transport to a local SMTP server; use TLS and perform client
## authentication.
## Transport to a local SMTP server; use TLS and perform client
## authentication.