diff options
| -rw-r--r-- | usr.sbin/ndp/ndp.8 | 11 | ||||
| -rw-r--r-- | usr.sbin/ndp/ndp.c | 22 |
2 files changed, 10 insertions, 23 deletions
diff --git a/usr.sbin/ndp/ndp.8 b/usr.sbin/ndp/ndp.8 index 29e71650d19..23f7aceb697 100644 --- a/usr.sbin/ndp/ndp.8 +++ b/usr.sbin/ndp/ndp.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ndp.8,v 1.42 2017/07/12 16:56:48 florian Exp $ +.\" $OpenBSD: ndp.8,v 1.43 2017/07/13 11:28:02 florian Exp $ .\" $KAME: ndp.8,v 1.28 2002/07/17 08:46:33 itojun Exp $ .\" .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: July 12 2017 $ +.Dd $Mdocdate: July 13 2017 $ .Dt NDP 8 .Os .Sh NAME @@ -36,9 +36,7 @@ .Nd control/diagnose IPv6 Neighbor Discovery Protocol (NDP) .Sh SYNOPSIS .Nm ndp -.Op Fl nt -.Op Fl a | c -.Op Fl H +.Op Fl acnt .Op Fl A Ar wait .Op Fl d Ar hostname .Op Fl f Ar filename @@ -121,9 +119,6 @@ to be inserted in the neighbor cache. See the .Fl s option for a description of the file format. -.It Fl H -Harmonize consistency between the routing table and the default router -list; install the top entry of the list into the kernel routing table. .It Fl i Ar interface Op Ar flag ... View ND information for the specified interface. If additional arguments are given, diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c index d3c3b91a456..75ff6f6168d 100644 --- a/usr.sbin/ndp/ndp.c +++ b/usr.sbin/ndp/ndp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ndp.c,v 1.82 2017/07/12 16:56:48 florian Exp $ */ +/* $OpenBSD: ndp.c,v 1.83 2017/07/13 11:28:02 florian Exp $ */ /* $KAME: ndp.c,v 1.101 2002/07/17 08:46:33 itojun Exp $ */ /* @@ -158,13 +158,12 @@ main(int argc, char *argv[]) pid = getpid(); thiszone = gmt2local(0); rdomain = getrtable(); - while ((ch = getopt(argc, argv, "acd:f:i:nstA:HV:")) != -1) { + while ((ch = getopt(argc, argv, "acd:f:i:nstA:V:")) != -1) { switch (ch) { case 'a': case 'c': case 'p': case 'r': - case 'H': case 'P': case 's': if (mode) { @@ -245,13 +244,6 @@ main(int argc, char *argv[]) if (argc < 2 || argc > 4) usage(); exit(set(argc, argv) ? 1 : 0); - case 'H': - if (argc != 0) { - usage(); - /*NOTREACHED*/ - } - harmonize_rtr(); - break; case 0: if (argc != 1) { usage(); @@ -767,11 +759,11 @@ ndp_ether_aton(char *a, u_char *n) void usage(void) { - printf("usage: ndp [-nt] [-a | -c] [-H] "); - printf("[-A wait] [-d hostname]\n"); - printf("\t[-f filename] [-i interface [flag ...]]\n"); - printf("\t[-s nodename ether_addr [temp] [proxy]] "); - printf("[-V rdomain] [hostname]\n"); + printf("usage: ndp [-acnt] "); + printf("[-A wait] [-d hostname] [-f filename]\n"); + printf("\t[-i interface [flag ...]] "); + printf("[-s nodename ether_addr [temp] [proxy]]\n"); + printf("\t[-V rdomain] [hostname]\n"); exit(1); } |