diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2011-05-25 06:48:13 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2011-05-25 06:48:13 +0000 |
| commit | 15e2aff7b8093081850b3e5adddb16fd090c1b49 (patch) | |
| tree | a505728d80316d2022532f6c2dfd2ba200c0a6c2 /sys/net | |
| parent | 209640a14f301d72132790d3c4e8140f0a7d5af9 (diff) | |
Don't do last minute changes to diffs. Revert the argument change to
pf_scrub in the rule (no-state) case. Since the action (a) may be NULL
for e.g. the implicit pass rule. Should fix the panics seen by other
people.
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/pf.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/net/pf.c b/sys/net/pf.c index 04cf2a2d2bd..ed85dae824c 100644 --- a/sys/net/pf.c +++ b/sys/net/pf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf.c,v 1.745 2011/05/24 14:01:51 claudio Exp $ */ +/* $OpenBSD: pf.c,v 1.746 2011/05/25 06:48:12 claudio Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -5938,8 +5938,8 @@ done: else qid = s->qid; } else { - pf_scrub(m, a->scrub_flags, pd.af, a->min_ttl, - a->set_tos); + pf_scrub(m, r->scrub_flags, pd.af, r->min_ttl, + r->set_tos); if (pqid || (pd.tos & IPTOS_LOWDELAY)) qid = r->pqid; else @@ -6224,8 +6224,8 @@ done: else qid = s->qid; } else { - pf_scrub(m, a->scrub_flags, pd.af, a->min_ttl, - a->set_tos); + pf_scrub(m, r->scrub_flags, pd.af, r->min_ttl, + r->set_tos); if (pqid || (pd.tos & IPTOS_LOWDELAY)) qid = r->pqid; else |