KekenoBSD/src
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

pfctl: Fail on missing anchor

Browse Source 
There is no reason to continue on anchor specific paths if the given
anchor does not exist.

OK sashan

Obtained from:	OpenBSD, kn <kn@openbsd.org>, ad846651a1
Sponsored by:	Rubicon Communications, LLC ("Netgate")
This commit is contained in:
Kristof Provost
2025-07-07 09:09:32 +02:00
parent 004062345b
commit c87390026a
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sbin/pfctl/pfctl.c
+4 -14
View File
@@ -1340,13 +1340,8 @@ pfctl_show_rules(int dev, char *path, int opts, enum pfctl_show format,
u_int32_t mnr, nr;
memset(&prs, 0, sizeof(prs));
if ((ret = pfctl_get_rulesets(pfh, npath, &mnr)) != 0) {
if (ret == EINVAL)
fprintf(stderr, "Anchor '%s' "
"not found.\n", anchorname);
else
errc(1, ret, "DIOCGETRULESETS");
}
if ((ret = pfctl_get_rulesets(pfh, npath, &mnr)) != 0)
errx(1, "%s", pf_strerror(ret));
for (nr = 0; nr < mnr; ++nr) {
if ((ret = pfctl_get_ruleset(pfh, npath, nr, &prs)) != 0)
@@ -2962,13 +2957,8 @@ pfctl_walk_anchors(int dev, int opts, const char *anchor,
int ret;
memset(&pr, 0, sizeof(pr));
if ((ret = pfctl_get_rulesets(pfh, anchor, &mnr)) != 0) {
if (ret == EINVAL)
fprintf(stderr, "Anchor '%s' not found.\n", anchor);
else
errc(1, ret, "DIOCGETRULESETS");
return (-1);
}
if ((ret = pfctl_get_rulesets(pfh, anchor, &mnr)) != 0)
errx(1, "%s", pf_strerror(ret));
for (nr = 0; nr < mnr; ++nr) {
char sub[MAXPATHLEN];