summaryrefslogtreecommitdiff
path: root/usr.sbin/arp
diff options
context:
space:
mode:
authorThordur I. Bjornsson <thib@cvs.openbsd.org>2008-02-14 09:28:03 +0000
committerThordur I. Bjornsson <thib@cvs.openbsd.org>2008-02-14 09:28:03 +0000
commitdb269d9c8cc056a21d7624af5e686c397405fecb (patch)
tree06e01e3a3c32633365e818d211ea0a1e09837f3f /usr.sbin/arp
parentaa70e1f6b3439adde3f610d96ed37b307bc5cf51 (diff)
backout the change to make arp(8) default to -an;
Remove that blurp from the man page also. requested by deraadt@;
Diffstat (limited to 'usr.sbin/arp')
-rw-r--r--usr.sbin/arp/arp.87
-rw-r--r--usr.sbin/arp/arp.c5
2 files changed, 3 insertions, 9 deletions
diff --git a/usr.sbin/arp/arp.8 b/usr.sbin/arp/arp.8
index b6f2d535a37..464fbc05d5a 100644
--- a/usr.sbin/arp/arp.8
+++ b/usr.sbin/arp/arp.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: arp.8,v 1.22 2008/02/11 07:58:28 jmc Exp $
+.\" $OpenBSD: arp.8,v 1.23 2008/02/14 09:28:02 thib Exp $
.\" $NetBSD: arp.8,v 1.7 1995/03/01 11:50:59 chopps Exp $
.\"
.\" Copyright (c) 1985, 1991, 1993
@@ -30,7 +30,7 @@
.\"
.\" from: @(#)arp.8 8.1 (Berkeley) 6/6/93
.\"
-.Dd $Mdocdate: February 11 2008 $
+.Dd $Mdocdate: February 14 2008 $
.Dt ARP 8
.Os
.Sh NAME
@@ -59,9 +59,6 @@ when no optional parameters are supplied.
.Ar hostname
may be specified by name or by number,
using Internet dot notation.
-If no parameters are provided at all,
-a summary of all current ARP entries is provided
-.Pq Fl an .
.Pp
The options are as follows:
.Bl -tag -width Ds
diff --git a/usr.sbin/arp/arp.c b/usr.sbin/arp/arp.c
index 86b5d0e59d3..c8072e96526 100644
--- a/usr.sbin/arp/arp.c
+++ b/usr.sbin/arp/arp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: arp.c,v 1.42 2008/02/07 16:53:58 thib Exp $ */
+/* $OpenBSD: arp.c,v 1.43 2008/02/14 09:28:02 thib Exp $ */
/* $NetBSD: arp.c,v 1.12 1995/04/24 13:25:18 cgd Exp $ */
/*
@@ -131,9 +131,6 @@ main(int argc, char *argv[])
break;
}
}
- if (argc == 1)
- aflag = nflag = 1;
-
argc -= optind;
argv += optind;