git: cd8438e5a3a4 - main - pfctl: fix retrieving nested anchors

[Kristof Provost]

The branch main has been updated by kp:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=cd8438e5a3a425ea44b261758e17fe62ebb45fce

commit cd8438e5a3a425ea44b261758e17fe62ebb45fce
Author:     Matteo Riondato <mat...@freebsd.org>
AuthorDate: 2022-03-17 18:48:28 +0000
Commit:     Kristof Provost <k...@freebsd.org>
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;