From eb8187c9b99852576940ecb4f065af5c4b542aac Mon Sep 17 00:00:00 2001 From: jmc Date: Sun, 21 Nov 2021 06:48:15 +0000 Subject: [PATCH] smtpd-filters.7 referred to itself internally as just filters(7): fix that, and put some Xr in smtpd.conf.5 so people can find it; from leon fischer --- usr.sbin/smtpd/smtpd-filters.7 | 12 +++++------- usr.sbin/smtpd/smtpd.conf.5 | 15 +++++++++++---- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/usr.sbin/smtpd/smtpd-filters.7 b/usr.sbin/smtpd/smtpd-filters.7 index d0823d95ca9..dbc990c1ce9 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.7 2021/11/20 19:11:33 jmc Exp $ +.\" $OpenBSD: smtpd-filters.7,v 1.8 2021/11/21 06:48:15 jmc Exp $ .\" .\" Copyright (c) 2008 Janne Johansson .\" Copyright (c) 2009 Jacek Masiulaniec @@ -17,14 +17,12 @@ .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" .\" -.Dd $Mdocdate: November 20 2021 $ -.Dt FILTERS 7 +.Dd $Mdocdate: November 21 2021 $ +.Dt SMTPD-FILTERS 7 .Os .Sh NAME -.Nm filters -.Nd filtering API for the -.Xr smtpd 8 -daemon +.Nm smtpd-filters +.Nd filtering API for the smtpd daemon .Sh DESCRIPTION The .Xr smtpd 8 diff --git a/usr.sbin/smtpd/smtpd.conf.5 b/usr.sbin/smtpd/smtpd.conf.5 index d05caf557f7..1c0e6415188 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.261 2021/08/05 06:33:20 jmc Exp $ +.\" $OpenBSD: smtpd.conf.5,v 1.262 2021/11/21 06:48:15 jmc 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: August 5 2021 $ +.Dd $Mdocdate: November 21 2021 $ .Dt SMTPD.CONF 5 .Os .Sh NAME @@ -397,7 +397,10 @@ Register and execute filter .Ar filter-name from -.Ar command . +.Ar command , +conformant with the +.Xr smtpd-filters 7 +API. If .Ar command starts with a slash it is executed with an absolute path, @@ -857,7 +860,10 @@ which disables DHE cipher suites. Register an external process named .Ar proc-name from -.Ar command . +.Ar command , +conformant with the +.Xr smtpd-filters 7 +API. Such processes may be used to share the same instance between multiple filters. If .Ar command @@ -1257,6 +1263,7 @@ match from any for domain example.com action "local_mail" .Sh SEE ALSO .Xr mailer.conf 5 , .Xr table 5 , +.Xr smtpd-filters 7 , .Xr makemap 8 , .Xr smtpd 8 .Sh HISTORY -- 2.20.1