diff options
| author |   henning <henning@openbsd.org> | 2009-11-23 21:29:21 +0000 |
|---|---|---|
| committer | henning <henning@openbsd.org> | 2009-11-23 21:29:21 +0000 |
| commit | e151341f7d6d2c7702ab021835e59c97c0f600ae (patch) | |
| tree | fe75eb20aaa4e6ace74d7a3b32982a370102a63f | |
| parent | Pad the ringbuffer with NOOPs before wrapping around, instead of (diff) | |
| download | wireguard-openbsd-e151341f7d6d2c7702ab021835e59c97c0f600ae.tar.xz wireguard-openbsd-e151341f7d6d2c7702ab021835e59c97c0f600ae.zip | |
since "nat/rdr pass" are history natpass can go
| -rw-r--r-- | sbin/pfctl/pfctl_optimize.c | 5 | ||||
| -rw-r--r-- | sbin/pfctl/pfctl_parser.c | 7 |
2 files changed, 4 insertions, 8 deletions
diff --git a/sbin/pfctl/pfctl_optimize.c b/sbin/pfctl/pfctl_optimize.c index b17b7986822..6559ba44e38 100644 --- a/sbin/pfctl/pfctl_optimize.c +++ b/sbin/pfctl/pfctl_optimize.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfctl_optimize.c,v 1.21 2009/11/22 22:34:50 henning Exp $ */ +/* $OpenBSD: pfctl_optimize.c,v 1.22 2009/11/23 21:29:21 henning Exp $ */ /* * Copyright (c) 2004 Mike Frantzen <frantzen@openbsd.org> @@ -197,8 +197,7 @@ struct pf_rule_field { PF_RULE_FIELD(match_tag, DC), PF_RULE_FIELD(overload_tbl, DC), - /* These fields should never be set in a PASS/BLOCK rule */ - PF_RULE_FIELD(natpass, NEVER), + /* These fields should never be set in a PASS/BLOCK rule XXX fix*/ PF_RULE_FIELD(max_mss, NEVER), PF_RULE_FIELD(min_ttl, NEVER), PF_RULE_FIELD(set_tos, NEVER), diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c index b7715b3cf77..99c5b04164e 100644 --- a/sbin/pfctl/pfctl_parser.c +++ b/sbin/pfctl/pfctl_parser.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfctl_parser.c,v 1.251 2009/11/22 22:34:50 henning Exp $ */ +/* $OpenBSD: pfctl_parser.c,v 1.252 2009/11/23 21:29:21 henning Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -674,11 +674,8 @@ print_rule(struct pf_rule *r, const char *anchor_call, int verbose) } else printf("%s \"%s\"", anchortypes[r->action], anchor_call); - } else { + } else printf("%s", actiontypes[r->action]); - if (r->natpass) - printf(" pass"); - } if (r->action == PF_DROP) { if (r->rule_flag & PFRULE_RETURN) printf(" return"); |