summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2012-07-10 09:23:57 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2012-07-10 09:23:57 +0000
commitdcb9eb50d46c5653560119f1b72efdec02c551a3 (patch)
tree12d8be89aef4f03b2a90e13e77e9f6f2d18a51cc /sbin
parent970047a6c418a599ffb59b0122ce963e569667ed (diff)
intermediate hack^Wugly "fix" to prevent spurious "scrub ()" prints
+ XXX comment as reminder to clean this up for good
Diffstat (limited to 'sbin')
-rw-r--r--sbin/pfctl/pfctl_parser.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c
index 3e81fd96166..d492ffbc1f1 100644
--- a/sbin/pfctl/pfctl_parser.c
+++ b/sbin/pfctl/pfctl_parser.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pfctl_parser.c,v 1.287 2012/07/10 09:13:41 henning Exp $ */
+/* $OpenBSD: pfctl_parser.c,v 1.288 2012/07/10 09:23:56 henning Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -998,7 +998,9 @@ print_rule(struct pf_rule *r, const char *anchor_call, int opts)
if (r->rule_flag & PFRULE_FRAGMENT)
printf(" fragment");
- if (r->scrub_flags >= PFSTATE_NODF || r->min_ttl || r->max_mss) {
+ /* XXX the scrub_flags mess needs to be cleaned up */
+ if ((r->scrub_flags & ~PFSTATE_SETTOS) >= PFSTATE_NODF ||
+ r->min_ttl || r->max_mss) {
printf(" scrub (");
ropts = 1;
if (r->scrub_flags & PFSTATE_NODF) {