diff options
| author | Eric Faurot <eric@cvs.openbsd.org> | 2018-09-24 16:14:35 +0000 |
|---|---|---|
| committer | Eric Faurot <eric@cvs.openbsd.org> | 2018-09-24 16:14:35 +0000 |
| commit | 681145f0d4f58f7d8231319eebb8dc4931bea169 (patch) | |
| tree | 74b82629647cdea1cd0d943b04456780d5efb6be /usr.sbin/smtpd/smtpd.conf.5 | |
| parent | 5e85f2b6d4d448a1b04c9c07639a4259e1d182ca (diff) | |
Allow to use the "tls" keyword on any relay action to force TLS, with
strict certificate validation. The "no-verify" becomes optional.
ok gilles@ millert@ semarie@
Diffstat (limited to 'usr.sbin/smtpd/smtpd.conf.5')
| -rw-r--r-- | usr.sbin/smtpd/smtpd.conf.5 | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/usr.sbin/smtpd/smtpd.conf.5 b/usr.sbin/smtpd/smtpd.conf.5 index f897b9a7101..02a7b281981 100644 --- a/usr.sbin/smtpd/smtpd.conf.5 +++ b/usr.sbin/smtpd/smtpd.conf.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: smtpd.conf.5,v 1.204 2018/09/10 12:42:17 jmc Exp $ +.\" $OpenBSD: smtpd.conf.5,v 1.205 2018/09/24 16:14:34 eric Exp $ .\" .\" Copyright (c) 2008 Janne Johansson <jj@openbsd.org> .\" Copyright (c) 2009 Jacek Masiulaniec <jacekm@dobremiasto.net> @@ -17,7 +17,7 @@ .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" .\" -.Dd $Mdocdate: September 10 2018 $ +.Dd $Mdocdate: September 24 2018 $ .Dt SMTPD.CONF 5 .Os .Sh NAME @@ -265,8 +265,13 @@ and .Dq smtps protocols for authentication. Server certificates for those protocols are verified by default. -.It Cm tls no-verify -Do not require a valid certificate for the specified host. +.It Cm tls Op no-verify +Require TLS to be used when relaying, using mandatory STARTTLS by default. +When used with a smarthost, the protocol must not be +.Dq smtp+notls:// . +If +.Op no-verify +is specified, do not require a valid certificate. .It Cm auth Pf < Ar table Ns > Use the mapping .Ar table |