diff options
| author | Kristof Provost <kp@FreeBSD.org> | 2021-04-26 08:07:07 +0000 |
|---|---|---|
| committer | Kristof Provost <kp@FreeBSD.org> | 2021-04-27 07:05:14 +0000 |
| commit | d5b08e13dd6beb3436e181ff1f3e034cc8186584 (patch) | |
| tree | 4956a8cc82b502bd0bede150e45cc8498e31dff5 /sbin/pfctl/pfctl_parser.c | |
| parent | 439d087d0b55574db81f4a2799a411c1236d95e3 (diff) | |
| download | src-d5b08e13dd6beb3436e181ff1f3e034cc8186584.tar.gz src-d5b08e13dd6beb3436e181ff1f3e034cc8186584.zip | |
pfctl: Revert "pfctl: Another set skip <group> fix"
This reverts commit 0c156a3c32cd0d9168570da5686ddc96abcbbc5a.
This fix broke using '<ifgroup>:network' in tables.
MFC after: 1 week
Diffstat (limited to 'sbin/pfctl/pfctl_parser.c')
| -rw-r--r-- | sbin/pfctl/pfctl_parser.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c index 282a0922bec7..ce460ab691ca 100644 --- a/sbin/pfctl/pfctl_parser.c +++ b/sbin/pfctl/pfctl_parser.c @@ -1396,26 +1396,6 @@ ifa_exists(char *ifa_name) return (NULL); } -static struct node_host * -if_lookup(char *if_name) -{ - struct node_host *p, *n; - - for (p = iftab; p; p = p->next) { - if (! strcmp(if_name, p->ifname)) { - n = calloc(1, sizeof(struct node_host)); - bcopy(p, n, sizeof(struct node_host)); - - n->next = NULL; - n->tail = n; - - return (n); - } - } - - return (NULL); -} - struct node_host * ifa_grouplookup(char *ifa_name, int flags) { @@ -1439,7 +1419,7 @@ ifa_grouplookup(char *ifa_name, int flags) for (ifg = ifgr.ifgr_groups; ifg && len >= sizeof(struct ifg_req); ifg++) { len -= sizeof(struct ifg_req); - if ((n = if_lookup(ifg->ifgrq_member)) == NULL) + if ((n = ifa_lookup(ifg->ifgrq_member, flags)) == NULL) continue; if (h == NULL) h = n; |