summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorDavid Krause <david@cvs.openbsd.org>2004-03-20 09:31:43 +0000
committerDavid Krause <david@cvs.openbsd.org>2004-03-20 09:31:43 +0000
commite16080f4a6206c36604ff427659e65b28410ad3d (patch)
treea34b636157874521d8b122f6d5e507d764744539 /sbin
parent472ffb892e829048baef545ce99026a430feca56 (diff)
make pfctl -s osfp work and remove -o option from manpage; ok deraadt@
pointed out by David Hill <davidh at wmis dot net>
Diffstat (limited to 'sbin')
-rw-r--r--sbin/pfctl/pfctl.87
-rw-r--r--sbin/pfctl/pfctl.c4
2 files changed, 3 insertions, 8 deletions
diff --git a/sbin/pfctl/pfctl.8 b/sbin/pfctl/pfctl.8
index d3794ca5669..6fac2d5bc64 100644
--- a/sbin/pfctl/pfctl.8
+++ b/sbin/pfctl/pfctl.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pfctl.8,v 1.109 2004/02/27 10:42:00 henning Exp $
+.\" $OpenBSD: pfctl.8,v 1.110 2004/03/20 09:31:42 david Exp $
.\"
.\" Copyright (c) 2001 Kjell Wooding. All rights reserved.
.\"
@@ -291,11 +291,6 @@ Show the current pool memory hard limits.
Show the list of tables.
.It Fl s Ar osfp
Show the list of operating system fingerprints.
-Can be used in combination with
-.Fl o Ar file
-to list the fingerprints in a
-.Xr pf.os 5
-file.
.It Fl s Ar Interfaces
Show the list of interfaces and interface drivers available to PF.
When used together with a double
diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c
index c882bcbed48..e13e1f44bfc 100644
--- a/sbin/pfctl/pfctl.c
+++ b/sbin/pfctl/pfctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pfctl.c,v 1.212 2004/03/15 15:25:44 dhartmei Exp $ */
+/* $OpenBSD: pfctl.c,v 1.213 2004/03/20 09:31:42 david Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -170,7 +170,7 @@ static const char *clearopt_list[] = {
static const char *showopt_list[] = {
"nat", "queue", "rules", "Anchors", "Sources", "state", "info",
- "Interfaces", "labels", "timeouts", "memory", "Tables", "ospf",
+ "Interfaces", "labels", "timeouts", "memory", "Tables", "osfp",
"all", NULL
};