summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorphessler <phessler@openbsd.org>2013-10-21 09:12:55 +0000
committerphessler <phessler@openbsd.org>2013-10-21 09:12:55 +0000
commit849a7603d1f0cf80d6ba8afe5c1ee4872d0fdf87 (patch)
tree21c1a937842d18ef935f505943976be698882416
parentAllow a user to switch to rdomain zero (diff)
downloadwireguard-openbsd-849a7603d1f0cf80d6ba8afe5c1ee4872d0fdf87.tar.xz
wireguard-openbsd-849a7603d1f0cf80d6ba8afe5c1ee4872d0fdf87.zip
Oups, a little bit overzealous. If we "route -T4 exec telnet foo", then
make sure telnet runs in rdomain 4 as expected. Same for nc.
-rw-r--r--usr.bin/nc/netcat.c3
-rw-r--r--usr.bin/telnet/main.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/usr.bin/nc/netcat.c b/usr.bin/nc/netcat.c
index 6123b7e4e34..dfa3a6a25b5 100644
--- a/usr.bin/nc/netcat.c
+++ b/usr.bin/nc/netcat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: netcat.c,v 1.115 2013/10/21 08:59:49 phessler Exp $ */
+/* $OpenBSD: netcat.c,v 1.116 2013/10/21 09:12:55 phessler Exp $ */
/*
* Copyright (c) 2001 Eric Jackson <ericj@monkey.org>
*
@@ -133,6 +133,7 @@ main(int argc, char *argv[])
host = NULL;
uport = NULL;
sv = NULL;
+ rtableid = getrtable();
while ((ch = getopt(argc, argv,
"46DdFhI:i:klNnO:P:p:rSs:tT:UuV:vw:X:x:z")) != -1) {
diff --git a/usr.bin/telnet/main.c b/usr.bin/telnet/main.c
index e767663f327..e94b1ccec55 100644
--- a/usr.bin/telnet/main.c
+++ b/usr.bin/telnet/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.20 2010/07/03 04:44:51 guenther Exp $ */
+/* $OpenBSD: main.c,v 1.21 2013/10/21 09:12:55 phessler Exp $ */
/* $NetBSD: main.c,v 1.5 1996/02/28 21:04:05 thorpej Exp $ */
/*
@@ -173,6 +173,7 @@ main(argc, argv)
* passed
*/
autologin = -1;
+ rtableid = getrtable();
while ((ch = getopt(argc, argv, "4678DEKLS:X:ab:cde:fFk:l:n:rt:V:x"))
!= -1) {