Module Name: src
Committed By: kre
Date: Fri Feb 7 13:00:48 UTC 2025
Modified Files:
src/external/bsd/blocklist/bin: blocklistd.8
Log Message:
Correct previous, we get configfile + configfile.d/*
That is, not just one or the other of the file and directory
(assuming that configfile is not a directory).
Pointed out by Hans Rosenfeld (hans@).
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 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.6 src/external/bsd/blocklist/bin/blocklistd.8:1.7
--- src/external/bsd/blocklist/bin/blocklistd.8:1.6 Fri Feb 7 01:28:27 2025
+++ src/external/bsd/blocklist/bin/blocklistd.8 Fri Feb 7 13:00:48 2025
@@ -1,4 +1,4 @@
-.\" $NetBSD: blocklistd.8,v 1.6 2025/02/07 01:28:27 kre Exp $
+.\" $NetBSD: blocklistd.8,v 1.7 2025/02/07 13:00:48 kre Exp $
.\"
.\" Copyright (c) 2015 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -67,11 +67,16 @@ Each entry contains a number of tries li
.Pp
If
.Ar configfile
-is a directory, or does not exist but a directory exists with the same name as
+is a directory, or a directory exists with the same name as
.Ar configfile
with
.Qq .d
appended to it, each file in the directory will be read as configuration file.
+If
+.Ar configfile
+exists as a file it will be processed before the contents of the
+.Ar configfile Ns .d
+directory if that also exists.
.Pp
The way
.Nm
