Module Name: src
Committed By: kre
Date: Fri Feb 7 01:28:27 UTC 2025
Modified Files:
src/external/bsd/blocklist/bin: blocklistd.8
Log Message:
Improve wording.
Don't say "usually xxx", which suggests that "xxx" is the normal
thing to use in the relevant case, where what is actually meant
is that "xxx" is what is used if the relevant case never occurs.
(eg: if the -X file option isn't given, the default is xxx,
rather than -X file specifies the file to use, usually xxx).
Also make it clear that the (extremely ugly) ".d" mangling of
the config file name only happens if the config file doesn't
exist. That is, if etc/blocklistd.conf and /etc/blocklistd.conf.d
both exist, only the former is used, unless the user expliclitly
says "-c /etc/blocklistd.conf.d".
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/blocklist/bin/blocklistd.8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/blocklist/bin/blocklistd.8
diff -u src/external/bsd/blocklist/bin/blocklistd.8:1.5 src/external/bsd/blocklist/bin/blocklistd.8:1.6
--- src/external/bsd/blocklist/bin/blocklistd.8:1.5 Thu Feb 6 19:16:03 2025
+++ src/external/bsd/blocklist/bin/blocklistd.8 Fri Feb 7 01:28:27 2025
@@ -1,4 +1,4 @@
-.\" $NetBSD: blocklistd.8,v 1.5 2025/02/06 19:16:03 christos Exp $
+.\" $NetBSD: blocklistd.8,v 1.6 2025/02/07 01:28:27 kre Exp $
.\"
.\" Copyright (c) 2015 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -67,7 +67,7 @@ Each entry contains a number of tries li
.Pp
If
.Ar configfile
-is a directory, or a directory exists with the same name as
+is a directory, or does not exist but a directory exists with the same name as
.Ar configfile
with
.Qq .d
@@ -160,7 +160,7 @@ The following options are available:
.It Fl C Ar controlprog
Use
.Ar controlprog
-to communicate with the packet filter, usually
+to communicate with the packet filter, instead of the default, which is
.Pa /libexec/blocklistd-helper .
The following arguments are passed to the control program:
.Bl -tag -width protocol
@@ -191,12 +191,16 @@ identifier of the rule to be removed.
The add command is expected to return the rule identifier string to stdout.
.El
.It Fl c Ar configuration
-The name of the configuration file to read, usually
+The name of the configuration file to read.
+The default when
+.Fl c
+is not given is
.Pa /etc/blocklistd.conf .
.It Fl D Ar dbfile
The Berkeley DB file where
.Nm
-stores its state, usually
+stores its state.
+It defaults to
.Pa /var/db/blocklistd.db .
.It Fl d
Normally,
