Date: Thu, 13 Oct 2022 12:44:30 GMT From: Ed Maste <emaste@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 1c14656dad0c - main - blacklistd: Reduce diff with upstream Message-ID: <202210131244.29DCiUqx098381@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1c14656dad0c8f6457b2be3a09939c399c98f55d commit 1c14656dad0c8f6457b2be3a09939c399c98f55d Author: Jose Luis Duran <jlduran@gmail.com> AuthorDate: 2022-10-12 19:17:51 +0000 Commit: Ed Maste <emaste@FreeBSD.org> CommitDate: 2022-10-13 12:25:32 +0000 blacklistd: Reduce diff with upstream No functional change intended. --- contrib/blacklist/libexec/blacklistd-helper | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/contrib/blacklist/libexec/blacklistd-helper b/contrib/blacklist/libexec/blacklistd-helper index 1af320d426b0..f92eab8b29bd 100644 --- a/contrib/blacklist/libexec/blacklistd-helper +++ b/contrib/blacklist/libexec/blacklistd-helper @@ -81,7 +81,7 @@ add) /sbin/pfctl -a "$2/$6" -f - # insert $ip/$mask into per-protocol/port anchored table /sbin/pfctl -qa "$2/$6" -t "port$6" -T add "$addr/$mask" && \ - /sbin/pfctl -q -k $addr && echo OK + /sbin/pfctl -qk "$addr" && echo OK ;; esac ;; @@ -119,8 +119,7 @@ flush) ;; pf) # dynamically determine which anchors exist - anchors=$(/sbin/pfctl -a $2 -s Anchors) - for anchor in $anchors; do + for anchor in $(/sbin/pfctl -a "$2" -s Anchors); do /sbin/pfctl -a $anchor -t "port${anchor##*/}" -T flush /sbin/pfctl -a $anchor -F rules done
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202210131244.29DCiUqx098381>