From nobody Thu Mar 24 13:14:38 2022 X-Original-To: dev-commits-src-branches@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 574F21A38E9A; Thu, 24 Mar 2022 13:14:38 +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 4KPQg21lQzz3MLW; Thu, 24 Mar 2022 13:14:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648127678; 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=QWPal45yGZvSdk3FpDZAohRrEVGtWXZ02nd1XxY9xmo=; b=T9SifKTH25HyT87qlQitgI+cIm7tBRAtCkpNK6xCuSBQXPo0RvYstxZI2Kzz547p1eapwz xSFEnoF/3KOCZ2rfrxrUgHHzrJgJU01fXpVGlobkJ8auSTKvMVJ9JlQsCv9nfjDJ2O9qiJ mzMwvgtwigm5O6DWpZGjW5OgD7sv7HStW77C63tr7s09Z8uU3Mu+FLaWrTOYwKIwSpShIn Q2pd1xJhO1NQHg0fJSfullh+Z6zSIYpxyqMY6WzBW91NxkmV+yxgrkNC9s6ymVzAqP1yo4 eFYh+dHbv/lhryhNpaevj7i1mi0yezFteVVOJ+eQ5cJouzS796ZwEjPhfOr7mg== 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 1A3D618986; Thu, 24 Mar 2022 13:14:38 +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 22ODEc3x032026; Thu, 24 Mar 2022 13:14:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22ODEcmO032025; Thu, 24 Mar 2022 13:14:38 GMT (envelope-from git) Date: Thu, 24 Mar 2022 13:14:38 GMT Message-Id: <202203241314.22ODEcmO032025@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: d56abf1d1623 - stable/12 - pfctl: fix retrieving nested anchors List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: d56abf1d16238eeaab74509999a8f9303534f918 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648127678; 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=QWPal45yGZvSdk3FpDZAohRrEVGtWXZ02nd1XxY9xmo=; b=Inaob6U6vqQxJV+T9WIupPQTAj7uaJViN3tE8gxAomm4mFQEsmMks8L84ksR7ckDjIjsbo aATRfPHjlxXUfDhodGf6ctOiVs5PFoOmrZPnMXs20uhbqhNIzMeeVv0ZDHDASTvDhETvux TUjX3ujZZgCXQ/y2rgPD5j6ZIo4uA/+FK8RdZttIxM4QBILzJQr03+rNUbNJb9yesdyTsI ZWVj5Q33489B/4ktPi1WVuF6SHMCqgFMqacsGXciIx2N0PAgq+AsnAZKmstOCAX/wm9rjT tchfgJwmRF1KtnsTEhPEzf5ldZX8iagoI1Krs7jN1cwpjHw5pf+mmXtde8LhLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648127678; a=rsa-sha256; cv=none; b=N8/6/ay7GtmNkk0G9maS7fChbBHF4j5Q0NylX5jaF8pmhQrI2V8Pqn14PxZPf9ORIaja7G otFtsfrwq7fqgPtHvlz32GErodvHYfaccLYPnKR1sGR1AlkziHe9/jHcBUfM22rug6pNbj /4ngNfQpzVkweEm4HE/iQqkZBCZJKV7f+8Q3B8Ekc4GUYWiIGsmHrYZNT96La8Gvv6FK4n /IIRMRu3uswGUMdZMnrx9fy41XakgktxG03+GI6uYO6IQKtC1mSJYoZBqBRr/y0HVVlfre C9eCmg2yqt3BmI3QOKczeHW6N0fHu3I8E0PGs/k4F4WFMGHEhHJ8RKzJwu3ckw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=d56abf1d16238eeaab74509999a8f9303534f918 commit d56abf1d16238eeaab74509999a8f9303534f918 Author: Matteo Riondato AuthorDate: 2022-03-17 18:48:28 +0000 Commit: Kristof Provost CommitDate: 2022-03-24 09:44:40 +0000 pfctl: fix retrieving nested anchors PR: 262622 MFC after: 1 week Reviewed by: kp (cherry picked from commit cd8438e5a3a425ea44b261758e17fe62ebb45fce) --- sbin/pfctl/pfctl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index 676d3eb1ce8d..17bd61fbccb2 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -1046,14 +1046,14 @@ pfctl_show_rules(int dev, char *path, int opts, enum pfctl_show format, snprintf(&path[len], MAXPATHLEN - len, "%s", anchorname); if (opts & PF_OPT_SHOWALL) { - ret = pfctl_get_rules_info(dev, &ri, PF_PASS, anchorname); + ret = pfctl_get_rules_info(dev, &ri, PF_PASS, path); if (ret != 0) { warn("DIOCGETRULES"); goto error; } header++; } - ret = pfctl_get_rules_info(dev, &ri, PF_SCRUB, anchorname); + ret = pfctl_get_rules_info(dev, &ri, PF_SCRUB, path); if (ret != 0) { warn("DIOCGETRULES"); goto error; @@ -1091,7 +1091,7 @@ pfctl_show_rules(int dev, char *path, int opts, enum pfctl_show format, } pfctl_clear_pool(&rule.rpool); } - ret = pfctl_get_rules_info(dev, &ri, PF_PASS, anchorname); + ret = pfctl_get_rules_info(dev, &ri, PF_PASS, path); if (ret != 0) { warn("DIOCGETRULES"); goto error;