diff options
| author |   jmc <jmc@openbsd.org> | 2012-07-16 05:56:16 +0000 |
|---|---|---|
| committer | jmc <jmc@openbsd.org> | 2012-07-16 05:56:16 +0000 |
| commit | d5bb1e0c71ee11db3189be7da88f84fcbad3cf0a (patch) | |
| tree | 7f8eb1fca87c727be2909126ad470b73e2e77ab7 | |
| parent | update examples: (diff) | |
| download | wireguard-openbsd-d5bb1e0c71ee11db3189be7da88f84fcbad3cf0a.tar.xz wireguard-openbsd-d5bb1e0c71ee11db3189be7da88f84fcbad3cf0a.zip | |
don;t quote things unneccessarily; ok gilles
| -rw-r--r-- | etc/mail/smtpd.conf | 4 | ||||
| -rw-r--r-- | usr.sbin/smtpd/smtpd.conf.5 | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/etc/mail/smtpd.conf b/etc/mail/smtpd.conf index a0d709ee8af..e3f13a97722 100644 --- a/etc/mail/smtpd.conf +++ b/etc/mail/smtpd.conf @@ -1,11 +1,11 @@ -# $OpenBSD: smtpd.conf,v 1.3 2012/05/12 18:47:41 gilles Exp $ +# $OpenBSD: smtpd.conf,v 1.4 2012/07/16 05:56:16 jmc Exp $ # This is the smtpd server system-wide configuration file. # See smtpd.conf(5) for more information. listen on lo0 -map "aliases" source db "/etc/mail/aliases.db" +map aliases source db "/etc/mail/aliases.db" accept for local alias aliases deliver to mbox accept for all relay diff --git a/usr.sbin/smtpd/smtpd.conf.5 b/usr.sbin/smtpd/smtpd.conf.5 index afc64958373..47a53af0de5 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.55 2012/07/15 17:04:31 gilles Exp $ +.\" $OpenBSD: smtpd.conf.5,v 1.56 2012/07/16 05:56:16 jmc 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: July 15 2012 $ +.Dd $Mdocdate: July 16 2012 $ .Dt SMTPD.CONF 5 .Os .Sh NAME @@ -424,7 +424,7 @@ listen on lo0 map aliases source db "/etc/mail/aliases.db" map secrets source db "/etc/mail/secrets.db" accept for local deliver to mbox -accept for all relay via "tls+auth://smtp.example.com" auth "secrets" +accept for all relay via tls+auth://smtp.example.com auth secrets .Ed .Pp In this second example, @@ -446,7 +446,7 @@ a certificate valid for one year was created. The configuration file would look like this: .Bd -literal -offset indent listen on lo0 -listen on bnx0 tls certificate "mail.example.com" enable auth +listen on bnx0 tls certificate mail.example.com enable auth map aliases source db "/etc/mail/aliases.db" accept for local deliver to mda "/path/to/mda -f -" accept from all for domain example.org \e |