aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGilles Chehade <gilles@poolp.org>2019-11-19 23:05:34 +0100
committerGilles Chehade <gilles@poolp.org>2019-11-19 23:05:34 +0100
commit807d987cf58229e7b96e63939ed2dfc60621f10a (patch)
tree244e1885f82ad345ce7585382e9f99a525e4d0b0
parentrename libopenbsd-compat to libopenbsd (diff)
parentsync (diff)
downloadOpenSMTPD-portable.tar.xz
OpenSMTPD-portable.zip
Merge branch 'master' into portableportable
-rw-r--r--smtpd/smtpd.conf.520
1 files changed, 11 insertions, 9 deletions
diff --git a/smtpd/smtpd.conf.5 b/smtpd/smtpd.conf.5
index 580d5838..ca4087c3 100644
--- a/smtpd/smtpd.conf.5
+++ b/smtpd/smtpd.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: smtpd.conf.5,v 1.226 2019/09/20 18:47:23 jmc Exp $
+.\" $OpenBSD: smtpd.conf.5,v 1.228 2019/11/19 22:04:04 gilles Exp $
.\"
.\" Copyright (c) 2008 Janne Johansson <jj@openbsd.org>
.\" Copyright (c) 2009 Jacek Masiulaniec <jacekm@dobremiasto.net>
@@ -17,7 +17,7 @@
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
.\"
-.Dd $Mdocdate: September 20 2019 $
+.Dd $Mdocdate: November 19 2019 $
.Dt SMTPD.CONF 5
.Os
.Sh NAME
@@ -536,7 +536,7 @@ With the
option, clients must also provide a valid certificate
to establish an SMTP session.
.El
-.It Ic listen on Cm socket Op Cm mask-src
+.It Ic listen on Cm socket Oo Ar mask-src Oc Op Cm tag Ar tag
Listen for incoming SMTP connections on the Unix domain socket
.Pa /var/run/smtpd.sock .
This is done by default, even if the directive is absent.
@@ -544,9 +544,11 @@ If the
.Cm mask-src
option is specified, printing of the HELO name, hostname, and IP
address of the originating host is suppressed in Received: header lines.
-.\" XXX The option
-.\" Cm filter Ar string
-.\" is parsed, but not implemented, see smtpf_session.c.
+If the
+.Cm tag
+option is specified,
+sessions initiated from the socket will be tagged
+.Ar tag .
.It Ic match Ar options Cm action Ar name
If at least one mail envelope matches the
.Ar options
@@ -927,7 +929,7 @@ The following phases are currently supported:
.El
.Pp
At each phase,
-multiple criterias may be checked:
+multiple criteria may be checked:
.Bl -column XXXXXXXXXXXXXXXXXXXXX -offset indent
.It fcrdns Ta forward-confirmed reverse DNS is valid
.It rdns Ta session has a reverse DNS
@@ -938,11 +940,11 @@ multiple criterias may be checked:
.It rcpt-to Pf < Ar table Ns > Ta recipient address is in table
.El
.Pp
-All criterias from previous phases are available to subsequent phases,
+All criteria from previous phases are available to subsequent phases,
so while the helo criteria is not available before the helo or ehlo phase,
the fcrdns criteria is available in all phases.
.Pp
-Criterias may all be negated by prefixing them with an exclamation mark:
+Criteria may all be negated by prefixing them with an exclamation mark:
.Bl -column XXXXXXXXXXXXXXXXXXXXX -offset indent
.It ! fcrdns Ta forward-confirmed reverse DNS is invalid
.El