summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2018-06-04 12:15:11 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2018-06-04 12:15:11 +0000
commitbe0814e9c602ae34f29d9df09198883ab2ad3de1 (patch)
treebcde00de400471b5581ed025575cc5d5757850f9
parent8b7026e43492ef94d4d2a92f09ca6f22ed7a5896 (diff)
tweak the text of the relaying example: make it clear that the example
allows delivery as well as relaying (for authenticated users), and that passing to an external mda is possible, but not required; ok gilles
-rw-r--r--usr.sbin/smtpd/smtpd.conf.510
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/smtpd/smtpd.conf.5 b/usr.sbin/smtpd/smtpd.conf.5
index f842e49f850..aee0ace7a66 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.188 2018/06/04 11:52:40 jmc Exp $
+.\" $OpenBSD: smtpd.conf.5,v 1.189 2018/06/04 12:15:10 jmc Exp $
.\"
.\" Copyright (c) 2008 Janne Johansson <jj@openbsd.org>
.\" Copyright (c) 2009 Jacek Masiulaniec <jacekm@dobremiasto.net>
@@ -720,11 +720,11 @@ match for any action "relay"
.Ed
.Pp
In this second example,
-the aim is to permit mail relaying for any user that can authenticate
-using their normal login credentials.
+the aim is to permit mail delivery and relaying only for users that can authenticate
+(using their normal login credentials).
An RSA certificate must be provided to prove the server's identity.
-The mail server listens on all interfaces the default route(s) point to.
-Mail with a local destination should be sent to an external mda.
+The mail server listens on all interfaces the default routes point to.
+Mail with a local destination is sent to an external MDA.
First, the RSA certificate is created:
.Bd -literal -offset indent
# openssl genrsa \-out /etc/ssl/private/mail.example.com.key 4096