diff options
author | Henning Brauer <henning@cvs.openbsd.org> | 2003-03-10 13:28:01 +0000 |
---|---|---|
committer | Henning Brauer <henning@cvs.openbsd.org> | 2003-03-10 13:28:01 +0000 |
commit | 0f9097e8afae197e6738faaaa29f3e80696e9e8c (patch) | |
tree | 07a90c4f67057187a21730b74c321dc0cfbd325c | |
parent | daeea81710ee2124a28b9a1e2e4a1de0eab78018 (diff) |
it doesn't make sense to mimic pfctl -vsr output in pfctl -vsl (same for
-vvsr ./. -vvsl). this resulted in more or less garbage in pfctl -vsl and
-vvsl output.
so ignore the extra verbosity flags for -sl.
found by pb@
ok pb@ dhartmei@
-rw-r--r-- | sbin/pfctl/pfctl.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index 39a87241b8e..0479529c521 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfctl.c,v 1.158 2003/03/08 14:26:31 henning Exp $ */ +/* $OpenBSD: pfctl.c,v 1.159 2003/03/10 13:28:00 henning Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -569,10 +569,7 @@ pfctl_show_rules(int dev, int opts, int format) switch (format) { case 1: if (pr.rule.label[0]) { - if (opts & PF_OPT_VERBOSE) - print_rule(&pr.rule, rule_numbers); - else - printf("%s ", pr.rule.label); + printf("%s ", pr.rule.label); printf("%llu %llu %llu\n", pr.rule.evaluations, pr.rule.packets, pr.rule.bytes); @@ -604,10 +601,7 @@ pfctl_show_rules(int dev, int opts, int format) switch (format) { case 1: if (pr.rule.label[0]) { - if (opts & PF_OPT_VERBOSE) - print_rule(&pr.rule, rule_numbers); - else - printf("%s ", pr.rule.label); + printf("%s ", pr.rule.label); printf("%llu %llu %llu\n", pr.rule.evaluations, pr.rule.packets, pr.rule.bytes); |