diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-02-23 06:58:31 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-02-23 06:58:31 +0000 |
| commit | e3cceaae134f7f074291370048fbe6c005b12e45 (patch) | |
| tree | 26125bb21ac6f96fc1f230b48cd82c1e27ba879b | |
| parent | f68b45c3214e3b0a1a41b711a1e0eae308207e20 (diff) | |
back out last commit since it breaks a few regress tests -- this will be
looked at post-release -- out of time for these kinds of problems
david@ says: pfopt6 and f91.ok; pfopt6 change looks ok, but pf91 is
of concern.
| -rw-r--r-- | sbin/pfctl/pfctl.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index 3bc704fa121..12f59517c7f 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfctl.c,v 1.279 2009/02/16 23:53:59 sthen Exp $ */ +/* $OpenBSD: pfctl.c,v 1.280 2009/02/23 06:58:30 deraadt Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -1352,7 +1352,8 @@ pfctl_load_rule(struct pfctl *pf, char *path, struct pf_rule *r, int depth) if (pf->opts & PF_OPT_VERBOSE) { INDENT(depth, !(pf->opts & PF_OPT_VERBOSE2)); - print_rule(r, name, pf->opts & PF_OPT_VERBOSE2); + print_rule(r, r->anchor ? r->anchor->name : "", + pf->opts & PF_OPT_VERBOSE2); } path[len] = '\0'; pfctl_clear_pool(&r->rpool); |