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 /serverloop.c | |
| parent | 6ef49e83e30688504552ac10875feabd5521565f (diff) | |
upstream commit
remove roaming support; ok djm@
Upstream-ID: 2cab8f4b197bc95776fb1c8dc2859dad0c64dc56
Diffstat (limited to 'serverloop.c')
| -rw-r--r-- | serverloop.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/serverloop.c b/serverloop.c index 85fc8d3a..47bc168b 100644 --- a/serverloop.c +++ b/serverloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: serverloop.c,v 1.180 2015/12/04 16:41:28 markus Exp $ */ +/* $OpenBSD: serverloop.c,v 1.181 2016/01/14 16:17:40 markus Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -78,7 +78,6 @@ #include "dispatch.h" #include "auth-options.h" #include "serverloop.h" -#include "roaming.h" #include "ssherr.h" extern ServerOptions options; @@ -399,11 +398,8 @@ process_input(fd_set *readset) /* Read and buffer any input data from the client. */ if (FD_ISSET(connection_in, readset)) { - int cont = 0; - len = roaming_read(connection_in, buf, sizeof(buf), &cont); + len = read(connection_in, buf, sizeof(buf)); if (len == 0) { - if (cont) - return; verbose("Connection closed by %.100s", get_remote_ipaddr()); connection_closed = 1; |