From: op Date: Tue, 14 May 2024 13:32:09 +0000 (+0000) Subject: sync smtpd and protocol version in smtpd-filters(7) examples; ok gilles@ X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=e7aa4a7f3e09e0cabc5b53f720ecfc14f6a137e4;p=openbsd sync smtpd and protocol version in smtpd-filters(7) examples; ok gilles@ --- diff --git a/usr.sbin/smtpd/smtpd-filters.7 b/usr.sbin/smtpd/smtpd-filters.7 index e8affac8113..c9587450718 100644 --- a/usr.sbin/smtpd/smtpd-filters.7 +++ b/usr.sbin/smtpd/smtpd-filters.7 @@ -1,4 +1,4 @@ -.\" $OpenBSD: smtpd-filters.7,v 1.10 2023/07/07 14:52:00 op Exp $ +.\" $OpenBSD: smtpd-filters.7,v 1.11 2024/05/14 13:32:09 op Exp $ .\" .\" Copyright (c) 2008 Janne Johansson .\" Copyright (c) 2009 Jacek Masiulaniec @@ -17,7 +17,7 @@ .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" .\" -.Dd $Mdocdate: July 7 2023 $ +.Dd $Mdocdate: May 14 2024 $ .Dt SMTPD-FILTERS 7 .Os .Sh NAME @@ -127,7 +127,7 @@ provides .Nm with general configuration information in the form of key-value lines: .Bd -literal -offset indent -config|smtpd-version|6.6.1 +config|smtpd-version|7.5.0 config|smtp-session-timeout|300 config|subsystem|smtp-in config|ready @@ -149,9 +149,9 @@ expecting .Nm to respond or not depending on the stream: .Bd -literal -offset indent -report|0.5|1576146008.006099|smtp-in|link-connect|7641df9771b4ed00|mail.openbsd.org|pass|199.185.178.25:33174|45.77.67.80:25 -report|0.5|1576147242.200225|smtp-in|link-connect|7641dfb3798eb5bf|mail.openbsd.org|pass|199.185.178.25:31205|45.77.67.80:25 -report|0.5|1576148447.982572|smtp-in|link-connect|7641dfc063102cbd|mail.openbsd.org|pass|199.185.178.25:24786|45.77.67.80:25 +report|0.7|1576146008.006099|smtp-in|link-connect|7641df9771b4ed00|mail.openbsd.org|pass|199.185.178.25:33174|45.77.67.80:25 +report|0.7|1576147242.200225|smtp-in|link-connect|7641dfb3798eb5bf|mail.openbsd.org|pass|199.185.178.25:31205|45.77.67.80:25 +report|0.7|1576148447.982572|smtp-in|link-connect|7641dfc063102cbd|mail.openbsd.org|pass|199.185.178.25:24786|45.77.67.80:25 .Ed .Pp The character @@ -174,7 +174,7 @@ that do not require it and consumed gracefully by filters that do. .Pp There are currently three keys: .Bd -literal -offset indent -config|smtpd-version|6.6.1 +config|smtpd-version|7.5.0 config|smtp-session-timeout|300 config|subsystem|smtp-in .Ed @@ -193,7 +193,7 @@ Each report event is generated by .Xr smtpd 8 as a single line similar to the one below: .Bd -literal -offset indent -report|0.5|1576146008.006099|smtp-in|link-connect|7641df9771b4ed00|mail.openbsd.org|pass|199.185.178.25:33174|45.77.67.80:25 +report|0.7|1576146008.006099|smtp-in|link-connect|7641df9771b4ed00|mail.openbsd.org|pass|199.185.178.25:33174|45.77.67.80:25 .Ed .Pp The format consists of a protocol prefix containing the stream, @@ -204,7 +204,7 @@ the event and the unique session identifier, separated by .Dq | : .Bd -literal -offset indent -report|0.5|1576146008.006099|smtp-in|link-connect|7641df9771b4ed00 +report|0.7|1576146008.006099|smtp-in|link-connect|7641df9771b4ed00 .Ed .Pp It is followed by a suffix containing the event-specific parameters, @@ -462,7 +462,7 @@ Fields are separated by the .Dq | character. .Bd -literal -offset indent -filter|0.5|1576146008.006099|smtp-in|connect|7641df9771b4ed00|1ef1c203cc576e5d|mail.openbsd.org|pass|199.185.178.25:33174|45.77.67.80:25 +filter|0.7|1576146008.006099|smtp-in|connect|7641df9771b4ed00|1ef1c203cc576e5d|mail.openbsd.org|pass|199.185.178.25:33174|45.77.67.80:25 .Ed .Pp The format consists of a protocol prefix containing the stream, @@ -473,7 +473,7 @@ the filtering phase, the unique session identifier and an opaque token that the filter should provide in its response: .Bd -literal -offset indent -filter|0.5|1576146008.006099|smtp-in|connect|7641df9771b4ed00|1ef1c203cc576e5d +filter|0.7|1576146008.006099|smtp-in|connect|7641df9771b4ed00|1ef1c203cc576e5d .Ed .Pp It is followed by a suffix containing the phase-specific parameters of the @@ -515,9 +515,9 @@ phase, are fed a stream of lines corresponding to the message to filter, terminated by a single dot: .Bd -literal -offset indent -filter|0.5|1576146008.006099|smtp-in|data-line|7641df9771b4ed00|1ef1c203cc576e5d|line 1 -filter|0.5|1576146008.006103|smtp-in|data-line|7641df9771b4ed00|1ef1c203cc576e5d|line 2 -filter|0.5|1576146008.006105|smtp-in|data-line|7641df9771b4ed00|1ef1c203cc576e5d|. +filter|0.7|1576146008.006099|smtp-in|data-line|7641df9771b4ed00|1ef1c203cc576e5d|line 1 +filter|0.7|1576146008.006103|smtp-in|data-line|7641df9771b4ed00|1ef1c203cc576e5d|line 2 +filter|0.7|1576146008.006105|smtp-in|data-line|7641df9771b4ed00|1ef1c203cc576e5d|. .Ed .Pp They are expected to return an output stream