[src/trunk]: src/external/bsd/blocklist/libexec More ipfilter fixes (Jose Lui...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0fdc5671bbe4
branches:  trunk
changeset: 372331:0fdc5671bbe4
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Nov 15 21:05:00 2022 +0000

description:
More ipfilter fixes (Jose Luis Duran)

diffstat:

 external/bsd/blocklist/libexec/blocklistd-helper |  14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diffs (25 lines):

diff -r fd31b7971a70 -r 0fdc5671bbe4 external/bsd/blocklist/libexec/blocklistd-helper
--- a/external/bsd/blocklist/libexec/blocklistd-helper  Tue Nov 15 20:58:50 2022 +0000
+++ b/external/bsd/blocklist/libexec/blocklistd-helper  Tue Nov 15 21:05:00 2022 +0000
@@ -14,10 +14,18 @@
        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