diff options
Diffstat (limited to 'usr.sbin/smtpd/smtpd.conf.5')
| -rw-r--r-- | usr.sbin/smtpd/smtpd.conf.5 | 45 |
1 files changed, 28 insertions, 17 deletions
diff --git a/usr.sbin/smtpd/smtpd.conf.5 b/usr.sbin/smtpd/smtpd.conf.5 index fdd26a421a1..2f9f302d405 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.52 2012/05/13 13:58:31 jmc Exp $ +.\" $OpenBSD: smtpd.conf.5,v 1.53 2012/07/08 15:48:00 gilles Exp $ .\" .\" Copyright (c) 2008 Janne Johansson <jj@openbsd.org> .\" Copyright (c) 2009 Jacek Masiulaniec <jacekm@dobremiasto.net> @@ -16,7 +16,7 @@ .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" .\" -.Dd $Mdocdate: May 13 2012 $ +.Dd $Mdocdate: July 8 2012 $ .Dt SMTPD.CONF 5 .Os .Sh NAME @@ -320,26 +320,37 @@ respectively. .It Xo .Ic relay via .Ar host -.Op Ic port Ar port -.Op Ic tls | smtps | ssl .Op Ic certificate Ar name .Op Ic auth Ar map .Op Ic as Ar address .Xc Mail is relayed through the specified .Ar host -and -.Ar port . +expressed as an URL. +For example: +.Bd -literal -offset indent +smtp://mx1.example.org # use SMTP +smtp://mx1.example.org:4321 # use SMTP with port 4321 +.Ed +.Pp +The communication channel may be secured using one of the secure +schemas. +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 fallback to TLS +.Ed +.Pp +In addition, credentials for authenticated relaying may be provided +when using a secure schema. +For example: +.Bd -literal -offset indent +tls+auth://mx1.example.org # AUTH over TLS +smtps+auth://mx1.example.org # AUTH over SMTPS +ssl+auth://mx1.example.org # AUTH over either SMTPS or TLS +.Ed .Pp -The communication channel may be secured using the -.Ic tls -or -.Ic smtps -options. -The special keyword -.Ic ssl -means that any of the two is acceptable: -SMTPS is tried first, STARTTLS second. If a certificate .Ar name is specified and exists in the @@ -351,9 +362,9 @@ Creation of certificates is documented in .Pp If an SMTPAUTH session with .Ar host -is desired, use the +is desired, the .Ic auth -parameter to specify the +parameter is used to specify the .Ar map that holds the credentials. .Pp |