aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmc <jmc@openbsd.org>2020-04-23 21:28:08 +0000
committerjmc <jmc@openbsd.org>2020-04-23 21:28:08 +0000
commit2db3fc93cd516286275cb9571f95be3c64365945 (patch)
treea8a2ed877f26a134e74a6ff09aa9f3b71639cf27
parentCheck for the dispatcher name in the envelope validation function. (diff)
downloadOpenSMTPD-2db3fc93cd516286275cb9571f95be3c64365945.tar.xz
OpenSMTPD-2db3fc93cd516286275cb9571f95be3c64365945.zip
ce examples of "Ar arg Ar arg" with "Ar arg arg" and stop the spread;
-rw-r--r--aliases.56
-rw-r--r--smtpd-filters.720
2 files changed, 13 insertions, 13 deletions
diff --git a/aliases.5 b/aliases.5
index 802ca9a6..7c250c81 100644
--- a/aliases.5
+++ b/aliases.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: aliases.5,v 1.15 2018/05/24 11:38:24 gilles Exp $
+.\" $OpenBSD: aliases.5,v 1.16 2020/04/23 21:28:10 jmc Exp $
.\"
.\" Copyright (c) 2012 Gilles Chehade <gilles@poolp.org>
.\"
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: May 24 2018 $
+.Dd $Mdocdate: April 23 2020 $
.Dt ALIASES 5
.Os
.Sh NAME
@@ -77,7 +77,7 @@ will only use the part that precedes
.Sq +
as a
.Em key .
-.It Ar error : Ns Ar code Ar message
+.It Ar error : Ns Ar code message
A status code and message to return.
The code must be 3 digits,
starting 4XX (TempFail) or 5XX (PermFail).
diff --git a/smtpd-filters.7 b/smtpd-filters.7
index 1e1a27ef..f0c4707e 100644
--- a/smtpd-filters.7
+++ b/smtpd-filters.7
@@ -1,4 +1,4 @@
-.\" $OpenBSD: smtpd-filters.7,v 1.4 2020/01/06 13:42:42 gilles Exp $
+.\" $OpenBSD: smtpd-filters.7,v 1.5 2020/04/23 21:28:10 jmc 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: January 6 2020 $
+.Dd $Mdocdate: April 23 2020 $
.Dt FILTERS 7
.Os
.Sh NAME
@@ -213,7 +213,7 @@ mail.openbsd.org|pass|199.185.178.25:33174|45.77.67.80:25
.Pp
The list of events and event-specific parameters are provided here for smtp-in:
.Bl -tag -width Ds
-.It Ic link-connect : Ar rdns Ar fcrdns Ar src Ar dest
+.It Ic link-connect : Ar rdns fcrdns src dest
This event is generated upon connection.
.Pp
.Ar rdns
@@ -244,7 +244,7 @@ This event is generated upon display of the server banner.
.Pp
.Ar hostname
contains the hostname displayed in the banner.
-.It Ic link-identify : Ar method Ar identity
+.It Ic link-identify : Ar method identity
This event is generated upon
.Dq HELO
or
@@ -268,7 +268,7 @@ contains a colon-separated list of TLS properties including the TLS version,
the cipher suite used by the session and the cipher strenght in bits.
.It Ic link-disconnect
This event is generated upon disconnection of the client.
-.It Ic link-auth : Ar username Ar result
+.It Ic link-auth : Ar username result
This event is generated upon authentication attempt of the client.
.Pp
.Ar username
@@ -292,7 +292,7 @@ This event is generated when a transaction is initiated.
.Pp
.Ar message-id
contains the identifier for the transaction.
-.It Ic tx-mail : Ar message-id Ar address Ar result
+.It Ic tx-mail : Ar message-id Ar address result
This event is generated when client emits
.Dq MAIL FROM .
.Pp
@@ -318,7 +318,7 @@ if it was rejected
or
.Dq tempfail
if it was rejected for a transient error.
-.It Ic tx-rcpt : Ar message-id Ar address Ar result
+.It Ic tx-rcpt : Ar message-id Ar address result
This event is generated when client emits
.Dq RCPT TO .
.Pp
@@ -391,7 +391,7 @@ It contains the raw response as emitted by the server.
.Pp
.Ar response
contains the response emitted by the server to the client.
-.It Ic filter-report : Ar filter-kind Ar name Ar message
+.It Ic filter-report : Ar filter-kind Ar name message
This event is generated when a filter emits a report.
.Pp
.Ar filter-kind may be either
@@ -407,7 +407,7 @@ is the name of the filter that generated the report.
.Pp
.Ar message
is a filter-specific message.
-.It Ic filter-response : Ar phase Ar response Op param
+.It Ic filter-response : Ar phase response Op param
This event is generated when a filter responds to a filtering request.
.Pp
.Ar phase
@@ -543,7 +543,7 @@ filter-dataline|7641df9771b4ed00|1ef1c203cc576e5d|.
.Pp
The list of events and event-specific parameters are provided here for smtp-in:
.Bl -tag -width Ds
-.It Ic connect : Ar rdns Ar fcrdns Ar src Ar dest
+.It Ic connect : Ar rdns fcrdns src dest
This request is emitted after connection,
before the banner is displayed.
.It Ic helo : Ar identity