From nobody Thu Mar 24 13:15:50 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 190341A39FA9;
Thu, 24 Mar 2022 13:15:51 +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 4KPQhQ5lHHz3NHp;
Thu, 24 Mar 2022 13:15:50 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1648127751;
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=jRwnppqwqLk/1oXK2NMN8SuLnxKgAnmBQUCT6pjpN5U=;
b=i6dSWQi5/0hw+XcUQC1sIwa7EOg4ppRFr6Hu3/GHyP47qUKYO8m8cisrN8gG2tZFWareY5
De+CkNFLY2UYCrpZkuyff3HTV8AykWt2F+EMSJJYrvdxo46hLDzizvM5CibRaBPyDxux4/
II9sPyiJAIvApHnr934LvD/7jwXELh60oqP9TSr5XGxg5ufiP6QPFGeuukBAuHmB6LTdvb
Ql4U4rgqp9zFxus67gmYJ41+sfEjgD3xGkFMlBDHlTwSM0f0o2hrIpaHUVNY2n07QVcjcG
tUzyys8MYfY1pCQxLqvmGsjHdMeFAWsuOUPfBOepJbNuCmIXnysJ6GFM1nf+gQ==
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 94CFE18834;
Thu, 24 Mar 2022 13:15:50 +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 22ODFoDE032338;
Thu, 24 Mar 2022 13:15:50 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22ODFoa8032337;
Thu, 24 Mar 2022 13:15:50 GMT
(envelope-from git)
Date: Thu, 24 Mar 2022 13:15:50 GMT
Message-Id: <202203241315.22ODFoa8032337@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Kristof Provost <kp@FreeBSD.org>
Subject: git: 5567b132a40f - stable/13 - pfctl: fix retrieving nested anchors
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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/13
X-Git-Reftype: branch
X-Git-Commit: 5567b132a40f44a87884cb29d14faab39d24d832
Auto-Submitted: auto-generated
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1648127751;
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=jRwnppqwqLk/1oXK2NMN8SuLnxKgAnmBQUCT6pjpN5U=;
b=m14e1j1fGljpjSzK7JppGTUJZzl2JcGXL7gFkzK906r1RFc1T1E8fZYCAfU8xJCs0jgj+L
nKQ1kg6FM+BbKD+lqL8lpFJL3m110HgFjHb7zBvH0+CDmbXoZqVHM/q3fJdh8mMLHZHJPA
tx8dTTsho/mIMhAG/ed/1GtUNlWUke5BSl/opP4W036I5reD/kZuc6NYZHVGCX0vPAMYuJ
KyACapp/ye84Gj63P+ZzmxmvXm3GAp4QWLn2qt/k92yjRNPk0muj1Obxj5HiHmtPMTOt+N
VXmlafUVYYfgvnz3INS8GDwxdy7WzdOOEPXgB5yTOso5Jhy+em15hMrconyJ0A==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648127751; a=rsa-sha256; cv=none;
b=afnPchOQ7OgxFrAUithbHjeHCDGUVKUEhyEscn08Pgj/0mEH/0MxZjWm6G5aNlegkouf7K
P6YBaxPjm+Yjx4m9pVIczjgvyjJoZjo5Y7NCxPfdfGp7vvWaJ6MOvf4Ahm0Y7c88U9XVUm
cOZbzSJ0tRuv7hVhrWHHbfhDkTyq5Pz+hf5msZ/uTKFuKLYr4UcRh8iH3G/BBw8BwcY60w
5K80Iea2GWlGVGsErYfxXVZ8tI7On7ocJRS8ciKKHsfWD119NWKR1MPBXQ36lAU9fNHyAZ
gUxx865GqLcu9vd9ikolwT9iX9ur0u4bGSYtjVePSKkN11nFOnB7TQLyAAMDng==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by kp:
URL: https://cgit.FreeBSD.org/src/commit/?id=5567b132a40f44a87884cb29d14faab39d24d832
commit 5567b132a40f44a87884cb29d14faab39d24d832
Author: Matteo Riondato <matteo@FreeBSD.org>
AuthorDate: 2022-03-17 18:48:28 +0000
Commit: Kristof Provost <kp@FreeBSD.org>
CommitDate: 2022-03-24 09:44:31 +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;