diff options
| author |   mikeb <mikeb@openbsd.org> | 2011-12-19 23:26:16 +0000 |
|---|---|---|
| committer | mikeb <mikeb@openbsd.org> | 2011-12-19 23:26:16 +0000 |
| commit | 4a16887b1b98c1b9aac5e7849c6ea957b4e42697 (patch) | |
| tree | 6d4062ee3cec5cad3d472a67e19c55758dae4ee9 | |
| parent | fxp_init could bail out on errors without calling slpx. (diff) | |
| download | wireguard-openbsd-4a16887b1b98c1b9aac5e7849c6ea957b4e42697.tar.xz wireguard-openbsd-4a16887b1b98c1b9aac5e7849c6ea957b4e42697.zip | |
unbreak rule optimizer; ok henning, looks
| -rw-r--r-- | sbin/pfctl/parse.y | 4 | ||||
| -rw-r--r-- | sbin/pfctl/pfctl_optimize.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index 2d814d6e857..6cc44795855 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.612 2011/12/12 21:30:27 mikeb Exp $ */ +/* $OpenBSD: parse.y,v 1.613 2011/12/19 23:26:16 mikeb Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. @@ -4890,7 +4890,7 @@ expand_rule(struct pf_rule *r, int keeprule, struct node_if *interfaces, LOOP_THROUGH(struct node_uid, uid, uids, LOOP_THROUGH(struct node_gid, gid, gids, - r->af = r->naf = af; + r->af = af; error += collapse_redirspec(&r->rdr, r, rdr, 0); error += collapse_redirspec(&r->nat, r, nat, 0); diff --git a/sbin/pfctl/pfctl_optimize.c b/sbin/pfctl/pfctl_optimize.c index 3bb5edf535c..79b94a5141c 100644 --- a/sbin/pfctl/pfctl_optimize.c +++ b/sbin/pfctl/pfctl_optimize.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfctl_optimize.c,v 1.30 2011/11/23 10:24:37 henning Exp $ */ +/* $OpenBSD: pfctl_optimize.c,v 1.31 2011/12/19 23:26:16 mikeb Exp $ */ /* * Copyright (c) 2004 Mike Frantzen <frantzen@openbsd.org> @@ -175,6 +175,7 @@ struct pf_rule_field { PF_RULE_FIELD(dst.neg, NOMERGE), PF_RULE_FIELD(rtableid, NOMERGE), PF_RULE_FIELD(onrdomain, NOMERGE), + PF_RULE_FIELD(naf, NOMERGE), /* These fields can be merged */ PF_RULE_FIELD(src.addr, COMBINED), |