Module Name: src
Committed By: christos
Date: Tue Nov 15 21:05:00 UTC 2022
Modified Files:
src/external/bsd/blocklist/libexec: blocklistd-helper
Log Message:
More ipfilter fixes (Jose Luis Duran)
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/blocklist/libexec/blocklistd-helper
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/libexec/blocklistd-helper
diff -u src/external/bsd/blocklist/libexec/blocklistd-helper:1.6 src/external/bsd/blocklist/libexec/blocklistd-helper:1.7
--- src/external/bsd/blocklist/libexec/blocklistd-helper:1.6 Tue Nov 15 15:58:50 2022
+++ src/external/bsd/blocklist/libexec/blocklistd-helper Tue Nov 15 16:05:00 2022
@@ -14,10 +14,18 @@ if [ -f "/etc/ipfw-blocklist.rc" ]; then
pf="ipfw"
. /etc/ipfw-blocklist.rc
ipfw_offset=${ipfw_offset:-2000}
-elif [ -f "/etc/ipfilter.conf" ]; then
- pf="ipf"
else
- for f in npf pf ipf; do
+ # ipfilter NetBSD, FreeBSD, Linux
+ for f in /etc/ipf.conf /etc/ipf.rules /etc/netscript/ipfilter.conf; do
+ if [ -f "$f" ]; then
+ pf="ipf"
+ break
+ fi
+ done
+fi
+
+if [ -z "$pf" ]; then
+ for f in npf pf; do
if [ -f "/etc/$f.conf" ]; then
pf="$f"
break
