summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2015-09-11 20:08:41 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2015-09-11 20:08:41 +0000
commit8dc158b68a043ede88887724148c3bfcebc5c914 (patch)
tree023dec6a1ddd83ca4a5c9fe7261610e0b551fc3d
parentf124b6824e57436e65f138ece3603de6219f0291 (diff)
Remove RTF_XRESOLVE support.
-rw-r--r--sbin/route/keywords.h4
-rw-r--r--sbin/route/route.85
-rw-r--r--sbin/route/route.c5
-rw-r--r--sbin/route/show.c3
4 files changed, 5 insertions, 12 deletions
diff --git a/sbin/route/keywords.h b/sbin/route/keywords.h
index 3b2112300be..6df4423758c 100644
--- a/sbin/route/keywords.h
+++ b/sbin/route/keywords.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: keywords.h,v 1.30 2015/07/18 00:05:02 phessler Exp $ */
+/* $OpenBSD: keywords.h,v 1.31 2015/09/11 20:08:40 mpi Exp $ */
/* WARNING! This file was generated by keywords.sh */
@@ -66,7 +66,6 @@ enum {
K_SSTHRESH,
K_STATIC,
K_SWAP,
- K_XRESOLVE,
};
struct keytab keywords[] = {
@@ -127,6 +126,5 @@ struct keytab keywords[] = {
{ "ssthresh", K_SSTHRESH },
{ "static", K_STATIC },
{ "swap", K_SWAP },
- { "xresolve", K_XRESOLVE },
};
diff --git a/sbin/route/route.8 b/sbin/route/route.8
index 277bab57119..2dc16a8eb98 100644
--- a/sbin/route/route.8
+++ b/sbin/route/route.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: route.8,v 1.77 2015/07/18 00:05:02 phessler Exp $
+.\" $OpenBSD: route.8,v 1.78 2015/09/11 20:08:40 mpi Exp $
.\" $NetBSD: route.8,v 1.6 1995/03/18 15:00:13 cgd Exp $
.\"
.\" Copyright (c) 1983, 1991, 1993
@@ -30,7 +30,7 @@
.\"
.\" @(#)route.8 8.3 (Berkeley) 3/19/94
.\"
-.Dd $Mdocdate: July 18 2015 $
+.Dd $Mdocdate: September 11 2015 $
.Dt ROUTE 8
.Os
.Sh NAME
@@ -404,7 +404,6 @@ by indicating the following corresponding modifiers:
.It Fl proto2 Ta Dv RTF_PROTO2 Ta "set protocol specific routing flag #2"
.It Fl reject Ta Dv RTF_REJECT Ta "emit an ICMP unreachable when matched"
.It Fl static Ta Dv RTF_STATIC Ta "manually added route"
-.It Fl xresolve Ta Dv RTF_XRESOLVE Ta "emit mesg on use (for external lookup)"
.El
.Pp
The optional modifiers
diff --git a/sbin/route/route.c b/sbin/route/route.c
index 36e7e69bf4c..9e81715fc5c 100644
--- a/sbin/route/route.c
+++ b/sbin/route/route.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: route.c,v 1.176 2015/07/18 21:26:03 mpi Exp $ */
+/* $OpenBSD: route.c,v 1.177 2015/09/11 20:08:40 mpi Exp $ */
/* $NetBSD: route.c,v 1.16 1996/04/15 18:27:05 cgd Exp $ */
/*
@@ -513,9 +513,6 @@ newroute(int argc, char **argv)
case K_CLONING:
flags |= RTF_CLONING;
break;
- case K_XRESOLVE:
- flags |= RTF_XRESOLVE;
- break;
case K_STATIC:
flags |= RTF_STATIC;
break;
diff --git a/sbin/route/show.c b/sbin/route/show.c
index dbfae3a72c9..7276a7a5d85 100644
--- a/sbin/route/show.c
+++ b/sbin/route/show.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: show.c,v 1.100 2015/07/18 00:05:02 phessler Exp $ */
+/* $OpenBSD: show.c,v 1.101 2015/09/11 20:08:40 mpi Exp $ */
/* $NetBSD: show.c,v 1.1 1996/11/15 18:01:41 gwr Exp $ */
/*
@@ -80,7 +80,6 @@ static const struct bits bits[] = {
{ RTF_DONE, 'd' }, /* Completed -- for routing messages only */
{ RTF_MASK, 'm' }, /* Mask Present -- for routing messages only */
{ RTF_CLONING, 'C' },
- { RTF_XRESOLVE, 'X' },
{ RTF_LLINFO, 'L' },
{ RTF_STATIC, 'S' },
{ RTF_PROTO1, '1' },