diff options
| author |   markus <markus@openbsd.org> | 2001-07-15 16:17:08 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2001-07-15 16:17:08 +0000 |
| commit | fae758ec9e80d1276e646b8e34d30ad22fa4b38b (patch) | |
| tree | 9118ed380235cd1f36842ba00feea5e2c432fc6d /usr.bin/ssh/serverloop.c | |
| parent | add install target (diff) | |
| download | wireguard-openbsd-fae758ec9e80d1276e646b8e34d30ad22fa4b38b.tar.xz wireguard-openbsd-fae758ec9e80d1276e646b8e34d30ad22fa4b38b.zip | |
schedule client alive for ssh2 only, greg@cheers.bungi.com
Diffstat (limited to 'usr.bin/ssh/serverloop.c')
| -rw-r--r-- | usr.bin/ssh/serverloop.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/usr.bin/ssh/serverloop.c b/usr.bin/ssh/serverloop.c index dea4fa2f215..66192271cf7 100644 --- a/usr.bin/ssh/serverloop.c +++ b/usr.bin/ssh/serverloop.c @@ -35,7 +35,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: serverloop.c,v 1.74 2001/07/02 22:52:57 markus Exp $"); +RCSID("$OpenBSD: serverloop.c,v 1.75 2001/07/15 16:17:08 markus Exp $"); #include "xmalloc.h" #include "packet.h" @@ -183,11 +183,11 @@ wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp, int *maxfdp, * this could be randomized somewhat to make traffic * analysis more difficult, but we're not doing it yet. */ - if (max_time_milliseconds == 0 && options.client_alive_interval) { + if (compat20 && + max_time_milliseconds == 0 && options.client_alive_interval) { client_alive_scheduled = 1; max_time_milliseconds = options.client_alive_interval * 1000; - } else - client_alive_scheduled = 0; + } /* When select fails we restart from here. */ retry_select: @@ -1000,4 +1000,3 @@ server_init_dispatch(void) else server_init_dispatch_15(); } - |