summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmc <jmc@openbsd.org>2018-06-04 21:13:34 +0000
committerjmc <jmc@openbsd.org>2018-06-04 21:13:34 +0000
commit9d69c41fecefa0bdbeab0695f7a57187f0e52191 (patch)
tree0f051265d7276c552db81e1a6143b9ebf2ad8374
parentremove "from local" (the default) from one of the match rules: the line (diff)
downloadwireguard-openbsd-9d69c41fecefa0bdbeab0695f7a57187f0e52191.tar.xz
wireguard-openbsd-9d69c41fecefa0bdbeab0695f7a57187f0e52191.zip
for "match", document that envelopes that do not match anything are rejected,
and that rules are evaluated sequentially, first match wins; ok gilles
-rw-r--r--usr.sbin/smtpd/smtpd.conf.56
1 files changed, 5 insertions, 1 deletions
diff --git a/usr.sbin/smtpd/smtpd.conf.5 b/usr.sbin/smtpd/smtpd.conf.5
index 8e19e1a2814..81d71607548 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.191 2018/06/04 16:34:09 jmc Exp $
+.\" $OpenBSD: smtpd.conf.5,v 1.192 2018/06/04 21:13:34 jmc Exp $
.\"
.\" Copyright (c) 2008 Janne Johansson <jj@openbsd.org>
.\" Copyright (c) 2009 Jacek Masiulaniec <jacekm@dobremiasto.net>
@@ -384,6 +384,10 @@ directive, receive the incoming message, put a copy into each
matching envelope, and atomically save the envelopes to the mail
spool for later processing by the respective dispatcher
.Ar name .
+If the envelope does not match any options,
+it is rejected.
+Rules are evaluated sequentially,
+with the first match winning.
.Pp
The following matching options are supported and can all be negated:
.Bl -tag -width Ds