diff options
| author |   markus <markus@openbsd.org> | 2016-01-14 16:17:39 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2016-01-14 16:17:39 +0000 |
| commit | 9068ae8f34fcab1e99ad6c37c2ef9ca5e0586ef5 (patch) | |
| tree | bee8b7dbe30f8012dc57614541fcefc69749036a /usr.bin/ssh/serverloop.c | |
| parent | Kill unused variable 'lfile'. (diff) | |
| download | wireguard-openbsd-9068ae8f34fcab1e99ad6c37c2ef9ca5e0586ef5.tar.xz wireguard-openbsd-9068ae8f34fcab1e99ad6c37c2ef9ca5e0586ef5.zip | |
remove roaming support; ok djm@
Diffstat (limited to 'usr.bin/ssh/serverloop.c')
| -rw-r--r-- | usr.bin/ssh/serverloop.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/usr.bin/ssh/serverloop.c b/usr.bin/ssh/serverloop.c index 850693f3038..bd1de6e6022 100644 --- a/usr.bin/ssh/serverloop.c +++ b/usr.bin/ssh/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 @@ -74,7 +74,6 @@ #include "dispatch.h" #include "auth-options.h" #include "serverloop.h" -#include "roaming.h" #include "ssherr.h" extern ServerOptions options; @@ -383,11 +382,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; |