make pfctl -s all a bit more useful again by not printing a lllooooooottttt of

OS fingerprints and a list of interface drivers...
cedric deraadt ok

3 files changed, 13 insertions, 11 deletions

diff --git a/sbin/pfctl/pfctl.8 b/sbin/pfctl/pfctl.8
index 40d21298e71..d3794ca5669 100644
--- a/sbin/pfctl/pfctl.8
+++ b/sbin/pfctl/pfctl.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pfctl.8,v 1.108 2004/02/17 08:48:29 cedric Exp $
+.\" $OpenBSD: pfctl.8,v 1.109 2004/02/27 10:42:00 henning Exp $
 .\"
 .\" Copyright (c) 2001 Kjell Wooding.  All rights reserved.
 .\"
@@ -304,7 +304,8 @@ interface statistics are also shown.
 .Fl i
 can be used to select an interface or a group of interfaces.
 .It Fl s Ar all
-Show all of the above.
+Show all of the above, except for the lists of interfaces and operating
+system fingerprints.
 .El
 .It Fl T Ar command Op Ar address ...
 Specify the
diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c
index 8fc06b7a02c..aebbb2b7960 100644
--- a/sbin/pfctl/pfctl.c
+++ b/sbin/pfctl/pfctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfctl.c,v 1.209 2004/02/26 15:43:51 cedric Exp $ */
+/*	$OpenBSD: pfctl.c,v 1.210 2004/02/27 10:42:00 henning Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -1685,7 +1685,6 @@ main(int argc, char *argv[])
 			pfctl_show_limits(dev, opts);
 			pfctl_show_tables(anchorname, rulesetname, opts);
 			pfctl_show_fingerprints(opts);
-			pfctl_show_ifaces(ifaceopt, opts);
 			break;
 		case 'T':
 			pfctl_show_tables(anchorname, rulesetname, opts);
diff --git a/sbin/pfctl/pfctl_osfp.c b/sbin/pfctl/pfctl_osfp.c
index 5fb579bc9a2..6d1fb990257 100644
--- a/sbin/pfctl/pfctl_osfp.c
+++ b/sbin/pfctl/pfctl_osfp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfctl_osfp.c,v 1.7 2004/02/10 22:26:56 dhartmei Exp $ */
+/*	$OpenBSD: pfctl_osfp.c,v 1.8 2004/02/27 10:42:00 henning Exp $ */
 
 /*
  * Copyright (c) 2003 Mike Frantzen <frantzen@openbsd.org>
@@ -310,13 +310,15 @@ void
 pfctl_show_fingerprints(int opts)
 {
 	if (LIST_FIRST(&classes) != NULL) {
-		if (opts & PF_OPT_SHOWALL)
+		if (opts & PF_OPT_SHOWALL) {
 			pfctl_print_title("OS FINGERPRINTS:");
-
-		printf("Class\tVersion\tSubtype(subversion)\n");
-		printf("-----\t-------\t-------------------\n");
-		sort_name_list(opts, &classes);
-		print_name_list(opts, &classes, "");
+			printf("%u fingerprints loaded\n", fingerprint_count);
+		} else {
+			printf("Class\tVersion\tSubtype(subversion)\n");
+			printf("-----\t-------\t-------------------\n");
+			sort_name_list(opts, &classes);
+			print_name_list(opts, &classes, "");
+		}
 	}
 }