diff options
Diffstat (limited to 'usr.bin/telnet')
| -rw-r--r-- | usr.bin/telnet/commands.c | 10 | ||||
| -rw-r--r-- | usr.bin/telnet/externs.h | 4 | ||||
| -rw-r--r-- | usr.bin/telnet/main.c | 12 | ||||
| -rw-r--r-- | usr.bin/telnet/telnet.1 | 10 |
4 files changed, 18 insertions, 18 deletions
diff --git a/usr.bin/telnet/commands.c b/usr.bin/telnet/commands.c index 9b848f5da22..4d3b7e5bab5 100644 --- a/usr.bin/telnet/commands.c +++ b/usr.bin/telnet/commands.c @@ -1,4 +1,4 @@ -/* $OpenBSD: commands.c,v 1.51 2009/06/05 00:20:46 claudio Exp $ */ +/* $OpenBSD: commands.c,v 1.52 2010/07/03 04:44:51 guenther Exp $ */ /* $NetBSD: commands.c,v 1.14 1996/03/24 22:03:48 jtk Exp $ */ /* @@ -2396,10 +2396,10 @@ tn(argc, argv) if (net < 0) continue; - if (rdomain) { - if (setsockopt(net, IPPROTO_IP, SO_RDOMAIN, &rdomain, - sizeof(rdomain)) == -1) - perror("setsockopt (SO_RDOMAIN)"); + if (rtableid) { + if (setsockopt(net, IPPROTO_IP, SO_RTABLE, &rtableid, + sizeof(rtableid)) == -1) + perror("setsockopt (SO_RTABLE)"); } if (aliasp) { diff --git a/usr.bin/telnet/externs.h b/usr.bin/telnet/externs.h index 8729421c51c..c523ce02c66 100644 --- a/usr.bin/telnet/externs.h +++ b/usr.bin/telnet/externs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: externs.h,v 1.15 2009/06/05 00:20:46 claudio Exp $ */ +/* $OpenBSD: externs.h,v 1.16 2010/07/03 04:44:51 guenther Exp $ */ /* $KTH: externs.h,v 1.16 1997/11/29 02:28:35 joda Exp $ */ /* @@ -108,7 +108,7 @@ extern void (*encrypt_output) (unsigned char *, int); extern int (*decrypt_input) (int); #endif -extern u_int rdomain; /* routing domain to use */ +extern u_int rtableid; /* routing table to use */ /* * We keep track of each side of the option negotiation. diff --git a/usr.bin/telnet/main.c b/usr.bin/telnet/main.c index 7c78d6f8c76..e767663f327 100644 --- a/usr.bin/telnet/main.c +++ b/usr.bin/telnet/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.19 2009/10/27 23:59:44 deraadt Exp $ */ +/* $OpenBSD: main.c,v 1.20 2010/07/03 04:44:51 guenther Exp $ */ /* $NetBSD: main.c,v 1.5 1996/02/28 21:04:05 thorpej Exp $ */ /* @@ -54,7 +54,7 @@ static int default_forward=0; #endif int family = AF_UNSPEC; -u_int rdomain; +u_int rtableid; /* * Initialize variables. @@ -86,7 +86,7 @@ usage() # else "usage: %s [-468acdEFfKLrx] [-b hostalias] [-e escapechar] " "[-k realm]\n" - "\t[-l user] [-n tracefile] [-V rdomain] [-X authtype] " + "\t[-l user] [-n tracefile] [-V rtable] [-X authtype] " "[host [port]]\n", #endif __progname); @@ -326,11 +326,11 @@ main(argc, argv) #endif break; case 'V': - rdomain = (unsigned int)strtonum(optarg, 0, + rtableid = (unsigned int)strtonum(optarg, 0, RT_TABLEID_MAX, &errstr); if (errstr) { - fprintf(stderr, - "%s: Warning: -R ignored, rdomain %s: %s\n", + fprintf(stderr, "%s: Warning: " + "-V ignored, rtable %s: %s\n", prompt, errstr, optarg); } break; diff --git a/usr.bin/telnet/telnet.1 b/usr.bin/telnet/telnet.1 index eae86142678..1730369e72c 100644 --- a/usr.bin/telnet/telnet.1 +++ b/usr.bin/telnet/telnet.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: telnet.1,v 1.42 2009/06/05 06:47:12 jmc Exp $ +.\" $OpenBSD: telnet.1,v 1.43 2010/07/03 04:44:51 guenther Exp $ .\" $NetBSD: telnet.1,v 1.5 1996/02/28 21:04:12 thorpej Exp $ .\" .\" Copyright (c) 1983, 1990, 1993 @@ -30,7 +30,7 @@ .\" .\" from: @(#)telnet.1 8.4 (Berkeley) 2/3/94 .\" -.Dd $Mdocdate: June 5 2009 $ +.Dd $Mdocdate: July 3 2010 $ .Dt TELNET 1 .Os .Sh NAME @@ -47,7 +47,7 @@ protocol .Op Fl k Ar realm .Op Fl l Ar user .Op Fl n Ar tracefile -.Op Fl V Ar rdomain +.Op Fl V Ar rtable .Op Fl X Ar authtype .Oo .Ar host @@ -186,8 +186,8 @@ mode, the escape character is set to the tilde (~) character, unless modified by the .Fl e option. -.It Fl V Ar rdomain -Set the routing domain. +.It Fl V Ar rtable +Set the routing table to be used. The default is 0. .It Fl X Ar authtype Disables the |