Module Name: src Committed By: christos Date: Tue Nov 15 20:58:50 UTC 2022
Modified Files: src/external/bsd/blocklist/libexec: blocklistd-helper Log Message: NetBSD uses ipf.conf for ipfilter not ipfilter.conf (Hose Luis Duran) To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 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.5 src/external/bsd/blocklist/libexec/blocklistd-helper:1.6 --- src/external/bsd/blocklist/libexec/blocklistd-helper:1.5 Wed Oct 12 15:50:29 2022 +++ src/external/bsd/blocklist/libexec/blocklistd-helper Tue Nov 15 15:58:50 2022 @@ -14,10 +14,10 @@ if [ -f "/etc/ipfw-blocklist.rc" ]; then pf="ipfw" . /etc/ipfw-blocklist.rc ipfw_offset=${ipfw_offset:-2000} -fi - -if [ -z "$pf" ]; then - for f in npf pf ipfilter; do +elif [ -f "/etc/ipfilter.conf" ]; then + pf="ipf" +else + for f in npf pf ipf; do if [ -f "/etc/$f.conf" ]; then pf="$f" break