From nobody Thu Oct 13 12:44:30 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Mp8NZ3vkBz4ftbN; Thu, 13 Oct 2022 12:44:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mp8NZ3Jq1z3CGY; Thu, 13 Oct 2022 12:44:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665665070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I+mxAaO1Ra6YWrePibThj/Ql5oaaEH/7NabIehqecZc=; b=GreNB+JMNUEwloJSIRELTybKDuN4nHb20UmwOMlBe89qw0PnjHZ6xZioovdOVqfsnsMvG9 4iWTnrp12cGU5FTa7yQKJmFE2PbNAPf6bxIuB+/qYxSDnV79Tf6X7bqqUU6gdwBP988Cft bcA2OclyAvUzm5NIp+3Jcl/LJVMetnmO4mEew6iTduvEGIJ+VKcQOoeLXnudg5Iih4lMJy Dd4oFm6H7FxmCwNQSBBSoLobWg1Ntq7CI09A2EoybCIGerPN8LbOTgfZ11f2m/FSLhsQ7D 8yy1zfPY5GtDzVhAbGNlP4kVFN09A0vAdl8kt3Al0svAg/g4acjlXbI+FN9TIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Mp8NZ2L2qzQWw; Thu, 13 Oct 2022 12:44:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29DCiUxZ098382; Thu, 13 Oct 2022 12:44:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29DCiUqx098381; Thu, 13 Oct 2022 12:44:30 GMT (envelope-from git) Date: Thu, 13 Oct 2022 12:44:30 GMT Message-Id: <202210131244.29DCiUqx098381@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 1c14656dad0c - main - blacklistd: Reduce diff with upstream List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1c14656dad0c8f6457b2be3a09939c399c98f55d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665665070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I+mxAaO1Ra6YWrePibThj/Ql5oaaEH/7NabIehqecZc=; b=xukxJJ1uv/0loDlXf9tBkEYOAbtjnIux+ZGNvn+/3Ko0+X/A+gYUEDSwlZphMdW7KefMXK hM5LqTMZZGMODgLnnpDXo/+v3t26Di3oVIAbjk1MOUhhitoiP+Bh+IrQF2XhFtErqX1kBh SkC5XkI27T+iwixwOOyPT5kVJCbp1DLBvs+NXqyq2Mw0trV9ToqlKINv77hXXskOiZbz34 sh8kqDHbaP5Xk0OHfqn0E7wlOkzpXJVZc7/0OVcN1IUPojA//a7jOzomX0+dpK0fD/w2jn VWIKRm6VFg+OI4m3RzGuzgnNTOjS0cfguSYWgrzjACbkm0HtNAYZLUPwT7+tMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665665070; a=rsa-sha256; cv=none; b=DNlXz19JS8VJkl/3gAY5t43NDg33eKwhDqG8x2Cex6l8x16qgiYny6HL7O8AoONivAB2dA ipv8Cw1mY45A8jP8fRaNNj6NMqgO6ZGhOebP0OVxyvyxTxC3TrA+bhA9riYBTloN5iJ7K3 kI37+SkmF8uRdrn249NiaaTie4+PXqNPbE+4iPg9ADAFOfkp7/YyRbEHqOaIEtJCBaptBu p6If12aEk9NQzZfxlphZhZvHZHjPeAy/HGWE7l5G+V/fbW3SJyLbcqRkiY2TX5a8zaTAgL jJRo9zMnICUut+EfRmCrN7dlHPrRkWnz2Ro0orlwenUCb+Ft71ADHJSIjtBmuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1c14656dad0c8f6457b2be3a09939c399c98f55d commit 1c14656dad0c8f6457b2be3a09939c399c98f55d Author: Jose Luis Duran AuthorDate: 2022-10-12 19:17:51 +0000 Commit: Ed Maste 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