diff options
| author |   Gilles Chehade <gilles@poolp.org> | 2013-09-11 10:24:42 +0200 |
|---|---|---|
| committer | Gilles Chehade <gilles@poolp.org> | 2013-09-11 10:24:42 +0200 |
| commit | d6e203a4714d1d5e338972b0e2e855baa2d2b6c6 (patch) | |
| tree | a3210fc98095c1669cac4f4a0df0e9701acd8d3c | |
| parent | rename "ssl" to "secure" and avoid a token clash with openssl internals while at it (diff) | |
| download | OpenSMTPD-d6e203a4714d1d5e338972b0e2e855baa2d2b6c6.tar.xz OpenSMTPD-d6e203a4714d1d5e338972b0e2e855baa2d2b6c6.zip | |
rename "ssl" to "secure"
| -rw-r--r-- | smtpd/smtpd.conf.5 | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/smtpd/smtpd.conf.5 b/smtpd/smtpd.conf.5 index 3e2b967f..d2ee5a2e 100644 --- a/smtpd/smtpd.conf.5 +++ b/smtpd/smtpd.conf.5 @@ -321,7 +321,7 @@ For example: .Bd -literal -offset indent tls://mx1.example.org # use TLS smtps://mx1.example.org # use SMTPS -ssl://mx1.example.org # try SMTPS and \e +secure://mx1.example.org # try SMTPS and \e # fallback to TLS .Ed .Pp @@ -329,10 +329,10 @@ In addition, credentials for authenticated relaying may be provided when using a secure schema. For example: .Bd -literal -offset indent -tls+auth://label@mx.example.org # over TLS -smtps+auth://label@mx.example.org # over SMTPS -ssl+auth://label@mx.example.org # over either \e - # SMTPS or TLS +tls+auth://label@mx.example.org # over TLS +smtps+auth://label@mx.example.org # over SMTPS +secure+auth://label@mx.example.org # over either \e + # SMTPS or TLS .Ed .Pp If a certificate @@ -437,7 +437,7 @@ to MXs for this domain. .Ic listen on Ar interface .Op Ar family .Op Ic port Ar port -.Op Ic tls | tls-require | smtps +.Op Ic tls | tls-require | smtps | secure .Op Ic certificate Ar name .Op Ic auth | auth-optional .Op Ic tag Ar tag @@ -470,6 +470,8 @@ by default on port 465. .Ic tls-require may be used to force clients to establish a secure connection before being allowed to start an SMTP transaction. +.Ic secure +may be specified to provide both STARTTLS and SMTPS services. Host certificates may be used for these connections, and are searched for in the .Pa /etc/mail/certs |