pfctl: Revert "pfctl: Another set skip <group> fix"
This reverts commit 0c156a3c32
.
This fix broke using '<ifgroup>:network' in tables.
MFC after: 1 week
This commit is contained in:
parent
439d087d0b
commit
d5b08e13dd
@ -1396,26 +1396,6 @@ ifa_exists(char *ifa_name)
|
|||||||
return (NULL);
|
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 *
|
struct node_host *
|
||||||
ifa_grouplookup(char *ifa_name, int flags)
|
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);
|
for (ifg = ifgr.ifgr_groups; ifg && len >= sizeof(struct ifg_req);
|
||||||
ifg++) {
|
ifg++) {
|
||||||
len -= sizeof(struct ifg_req);
|
len -= sizeof(struct ifg_req);
|
||||||
if ((n = if_lookup(ifg->ifgrq_member)) == NULL)
|
if ((n = ifa_lookup(ifg->ifgrq_member, flags)) == NULL)
|
||||||
continue;
|
continue;
|
||||||
if (h == NULL)
|
if (h == NULL)
|
||||||
h = n;
|
h = n;
|
||||||
|
Loading…
Reference in New Issue
Block a user