diff options
author | markus@openbsd.org <markus@openbsd.org> | 2016-01-14 16:17:39 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2016-01-27 16:54:10 +1100 |
commit | a306863831c57ec5fad918687cc5d289ee8e2635 (patch) | |
tree | 0321a74bc4a9be03ad303d35306555ca0908ee25 /clientloop.c | |
parent | 6ef49e83e30688504552ac10875feabd5521565f (diff) |
upstream commit
remove roaming support; ok djm@
Upstream-ID: 2cab8f4b197bc95776fb1c8dc2859dad0c64dc56
Diffstat (limited to 'clientloop.c')
-rw-r--r-- | clientloop.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/clientloop.c b/clientloop.c index c0386d56b..d324e297b 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: clientloop.c,v 1.279 2016/01/13 23:04:47 djm Exp $ */ | 1 | /* $OpenBSD: clientloop.c,v 1.280 2016/01/14 16:17:39 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -111,7 +111,6 @@ | |||
111 | #include "sshpty.h" | 111 | #include "sshpty.h" |
112 | #include "match.h" | 112 | #include "match.h" |
113 | #include "msg.h" | 113 | #include "msg.h" |
114 | #include "roaming.h" | ||
115 | #include "ssherr.h" | 114 | #include "ssherr.h" |
116 | #include "hostfile.h" | 115 | #include "hostfile.h" |
117 | 116 | ||
@@ -756,7 +755,7 @@ client_suspend_self(Buffer *bin, Buffer *bout, Buffer *berr) | |||
756 | static void | 755 | static void |
757 | client_process_net_input(fd_set *readset) | 756 | client_process_net_input(fd_set *readset) |
758 | { | 757 | { |
759 | int len, cont = 0; | 758 | int len; |
760 | char buf[SSH_IOBUFSZ]; | 759 | char buf[SSH_IOBUFSZ]; |
761 | 760 | ||
762 | /* | 761 | /* |
@@ -765,8 +764,8 @@ client_process_net_input(fd_set *readset) | |||
765 | */ | 764 | */ |
766 | if (FD_ISSET(connection_in, readset)) { | 765 | if (FD_ISSET(connection_in, readset)) { |
767 | /* Read as much as possible. */ | 766 | /* Read as much as possible. */ |
768 | len = roaming_read(connection_in, buf, sizeof(buf), &cont); | 767 | len = read(connection_in, buf, sizeof(buf)); |
769 | if (len == 0 && cont == 0) { | 768 | if (len == 0) { |
770 | /* | 769 | /* |
771 | * Received EOF. The remote host has closed the | 770 | * Received EOF. The remote host has closed the |
772 | * connection. | 771 | * connection. |