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) | |
| download | openssh-git-a306863831c57ec5fad918687cc5d289ee8e2635.tar.gz | |
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 c0386d56..d324e297 100644 --- a/clientloop.c +++ b/clientloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.c,v 1.279 2016/01/13 23:04:47 djm Exp $ */ +/* $OpenBSD: clientloop.c,v 1.280 2016/01/14 16:17:39 markus Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -111,7 +111,6 @@ #include "sshpty.h" #include "match.h" #include "msg.h" -#include "roaming.h" #include "ssherr.h" #include "hostfile.h" @@ -756,7 +755,7 @@ client_suspend_self(Buffer *bin, Buffer *bout, Buffer *berr) static void client_process_net_input(fd_set *readset) { - int len, cont = 0; + int len; char buf[SSH_IOBUFSZ]; /* @@ -765,8 +764,8 @@ client_process_net_input(fd_set *readset) */ if (FD_ISSET(connection_in, readset)) { /* Read as much as possible. */ - len = roaming_read(connection_in, buf, sizeof(buf), &cont); - if (len == 0 && cont == 0) { + len = read(connection_in, buf, sizeof(buf)); + if (len == 0) { /* * Received EOF. The remote host has closed the * connection. |