git: b7780e24533b - stable/15 - Revert "blocklist-helper: Silence a bogus pf warning"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 30 Oct 2025 01:52:23 UTC
The branch stable/15 has been updated by jlduran:
URL: https://cgit.FreeBSD.org/src/commit/?id=b7780e24533b82a9b4b374facbd61fa0a83908fc
commit b7780e24533b82a9b4b374facbd61fa0a83908fc
Author: Jose Luis Duran <jlduran@FreeBSD.org>
AuthorDate: 2025-10-28 11:44:50 +0000
Commit: Jose Luis Duran <jlduran@FreeBSD.org>
CommitDate: 2025-10-30 01:48:53 +0000
Revert "blocklist-helper: Silence a bogus pf warning"
This reverts commit 2347ca21d657121670e6e7246c6ac32efc996cac.
A fix has been implemented in 99560fe98c76 ("pfctl: Do not warn if there
is no Ethernet anchor").
Revert this commit to avoid having differences with upstream.
MFC after: 2 days
(cherry picked from commit e12ec5f4338c2d769c266278320232a98a962f63)
---
contrib/blocklist/libexec/blocklistd-helper | 2 +-
libexec/blocklistd-helper/blacklistd-helper | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/blocklist/libexec/blocklistd-helper b/contrib/blocklist/libexec/blocklistd-helper
index 14a192ee35ce..f27cde4ed4ea 100755
--- a/contrib/blocklist/libexec/blocklistd-helper
+++ b/contrib/blocklist/libexec/blocklistd-helper
@@ -258,7 +258,7 @@ flush)
pf)
# dynamically determine which anchors exist
for anchor in $(/sbin/pfctl -a "$2" -s Anchors 2> /dev/null); do
- /sbin/pfctl -a "$anchor" -t "port${anchor##*/}" -T flush 2> /dev/null
+ /sbin/pfctl -a "$anchor" -t "port${anchor##*/}" -T flush
/sbin/pfctl -a "$anchor" -F rules
done
echo OK
diff --git a/libexec/blocklistd-helper/blacklistd-helper b/libexec/blocklistd-helper/blacklistd-helper
index 92f768e86cdf..4195f070e8ee 100644
--- a/libexec/blocklistd-helper/blacklistd-helper
+++ b/libexec/blocklistd-helper/blacklistd-helper
@@ -279,7 +279,7 @@ flush)
pf)
# dynamically determine which anchors exist
for anchor in $(/sbin/pfctl -a "$2" -s Anchors 2> /dev/null); do
- /sbin/pfctl -a "$anchor" -t "port${anchor##*/}" -T flush 2> /dev/null
+ /sbin/pfctl -a "$anchor" -t "port${anchor##*/}" -T flush
/sbin/pfctl -a "$anchor" -F rules
done
echo OK