D35429.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D35429.diff
View Options

	diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c
	--- a/sbin/pfctl/pfctl_parser.c
	+++ b/sbin/pfctl/pfctl_parser.c
	@@ -74,7 +74,7 @@
	struct pf_rule_addr *, u_int8_t, u_int8_t, int, int);
	int ifa_skip_if(const char filter, struct node_host p);

	-struct node_host host_if(const char , int);
	+struct node_host host_if(const char , int, int *);
	struct node_host host_v4(const char , int);
	struct node_host host_v6(const char , int);
	struct node_host host_dns(const char , int, int);
	@@ -1695,7 +1695,7 @@

	/* interface with this name exists? */
	/* expensive with thousands of interfaces - prioritze IPv4/6 check */
	- if (cont && (h = host_if(ps, mask)) != NULL)
	+ if (cont && (h = host_if(ps, mask, &cont)) != NULL)
	cont = 0;

	/* dns lookup */
	@@ -1711,7 +1711,7 @@
	}

	struct node_host *
	-host_if(const char *s, int mask)
	+host_if(const char s, int mask, int cont)
	{
	struct node_host n, h = NULL;
	char p, ps;
	@@ -1733,6 +1733,7 @@
	return (NULL);
	}
	*p = '\0';
	+ *cont = 0;
	}
	if (flags & (flags - 1) & PFI_AFLAG_MODEMASK) { /* Yep! */
	fprintf(stderr, "illegal combination of interface modifiers\n");