D34833.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D34833.diff
View Options

	diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c
	--- a/sys/netpfil/pf/pf.c
	+++ b/sys/netpfil/pf/pf.c
	@@ -3371,13 +3371,10 @@
	f = stack + *depth - 1;
	fr = PF_ANCHOR_RULE(f);
	if (f->child != NULL) {
	- struct pf_kanchor_node *parent;
	-
	/*
	* This block traverses through
	* a wildcard anchor.
	*/
	- parent = &fr->anchor->children;
	if (match != NULL && *match) {
	/*
	* If any of "*" matched, then
	@@ -3387,7 +3384,8 @@
	PF_ANCHOR_SET_MATCH(f);
	*match = 0;
	}
	- f->child = RB_NEXT(pf_kanchor_node, parent, f->child);
	+ f->child = RB_NEXT(pf_kanchor_node,
	+ &fr->anchor->children, f->child);
	if (f->child != NULL) {
	*rs = &f->child->ruleset;
	r = TAILQ_FIRST((rs)->rules[n].active.ptr);
	@@ -3475,12 +3473,10 @@
	f = stack + *depth - 1;
	fr = PF_ETH_ANCHOR_RULE(f);
	if (f->child != NULL) {
	- struct pf_keth_anchor_node *parent;
	/*
	* This block traverses through
	* a wildcard anchor.
	*/
	- parent = &fr->anchor->children;
	if (match != NULL && *match) {
	/*
	* If any of "*" matched, then
	@@ -3490,8 +3486,8 @@
	PF_ETH_ANCHOR_SET_MATCH(f);
	*match = 0;
	}
	- f->child = RB_NEXT(pf_keth_anchor_node, parent,
	- f->child);
	+ f->child = RB_NEXT(pf_keth_anchor_node,
	+ &fr->anchor->children, f->child);
	if (f->child != NULL) {
	*rs = &f->child->ruleset;
	r = TAILQ_FIRST((rs)->active.rules);