From nobody Thu Mar 17 21:38:39 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 246E11A259C4; Thu, 17 Mar 2022 21:38:40 +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 4KKL9r0TCyz3sBf; Thu, 17 Mar 2022 21:38:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647553120; 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=xgiVYEcygQLnfY+LLgFctclPEI8QFPqFvXgho+LKubk=; b=dboJtmh729zM3y5uX6NpN6XPKKG5PDTVPhpvOGPGHBvZJ1uGhyWBxJExPFVKcEQxOqkd7N 91DI2SM1Mre+UeBZ31SO72RHW7VeDZrcn4R01lDwYmhIunnmMTPV8DYaN58VwLM2ULCk+L XUCcOi/W3VJxZllPmfExXSMihaX/nkKxS61P+Q/nv/wX4dd1B75KroFCcx81Z6oDOlMRkf zKer9xxOcQk7PupGaUSbevoZZcdZHet1hDl5t7F9YQQ5E0Hc2M8ryw0L/DY4hMLwl1JRKV CBLp1MfQTVZGtSM2PBECGumqvtLXeBtSgMGPGQXsMcZu00+syO3hmoddNedy1g== 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 E0FC9126C7; Thu, 17 Mar 2022 21:38:39 +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 22HLcd7E024101; Thu, 17 Mar 2022 21:38:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22HLcd5I024100; Thu, 17 Mar 2022 21:38:39 GMT (envelope-from git) Date: Thu, 17 Mar 2022 21:38:39 GMT Message-Id: <202203172138.22HLcd5I024100@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: cd8438e5a3a4 - main - pfctl: fix retrieving nested anchors 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd8438e5a3a425ea44b261758e17fe62ebb45fce Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647553120; 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=xgiVYEcygQLnfY+LLgFctclPEI8QFPqFvXgho+LKubk=; b=Vr3pV8xPTLFvV2LO3WZR/Ftx28E2F13m9N2h/W09blkN+QuMuVXJgWjM066rPmJIqKKwdq UpfO+GoEW+YZZfsel92WWAa8bCV6Q5AVfQPKhQkKMhCjlRio9ZclsooAjMWKjf0As2yymI IogNBKhI0NIdH0Sq+jSgno2JsBsAolLTV9kj6Qnq0Sm3BcCLQVg13Yh+3dBNAkpbV+MzTV gaROnoFMzazcYPlbS9icZCO5QBRmyyAu4UaM+RBfiApcHtyd7x2koqC68IgRLn5EsiCEHL 2x7L5PdGoqXxfde+4Vtika5dwtiDgeheb9dDQ1uDscEyLyu3NFBOZqLFFdH07g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647553120; a=rsa-sha256; cv=none; b=ZGlsdU3tPdNHAaSFyi2vw6S73sbNNKGTKmwVJc1sDAMtJ7sL53eYZCLk61VRvFTjsaQ+o4 MDK48iPiaaPRbz/PEDCK+QkVc/pWwqInW8B5vvpn17SPAXHDCANiVy5Vfbih8nd+BUqi+Y hd1a0n6LvuaeOW6EfrzMZ+hT58dg3v9yU40NSK4usO9Sjyv866g9fNK1kmJC+3pGXnd/24 8Pe8mVH9g2Z34asBpIYRMB5Dud6KgZg8nrZuWRO1IM7FeosIOgUU4j2uWjqHiaysCyfR/q hOzhzUtPLSkJ8LRwcDQOMGQKZRPHXKKmFGnC/Sem2+xpL3xzrzHskknRd4JQ2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=cd8438e5a3a425ea44b261758e17fe62ebb45fce commit cd8438e5a3a425ea44b261758e17fe62ebb45fce Author: Matteo Riondato AuthorDate: 2022-03-17 18:48:28 +0000 Commit: Kristof Provost CommitDate: 2022-03-17 21:37:05 +0000 pfctl: fix retrieving nested anchors PR: 262622 MFC after: 1 week Reviewed by: kp --- 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 ffd978b304cb..4632d2dc3946 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -1150,14 +1150,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; @@ -1195,7 +1195,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;