- markus@cvs.openbsd.org 2001/07/15 16:17:08
[serverloop.c]
schedule client alive for ssh2 only, greg@cheers.bungi.com
diff --git a/ChangeLog b/ChangeLog
index d1625d2..12209e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,11 @@
20010718
- OpenBSD CVS Sync
- - stevesk@cvs.openbsd.org 2001/07/14 15:10:17
- [readpass.c sftp-client.c sftp-common.c sftp-glob.c]
- delete spurious #includes; ok deraadt@ markus@
+ - stevesk@cvs.openbsd.org 2001/07/14 15:10:17
+ [readpass.c sftp-client.c sftp-common.c sftp-glob.c]
+ delete spurious #includes; ok deraadt@ markus@
+ - markus@cvs.openbsd.org 2001/07/15 16:17:08
+ [serverloop.c]
+ schedule client alive for ssh2 only, greg@cheers.bungi.com
20010715
- (bal) Set "BROKEN_GETADDRINFO" for darwin platform. Reported by
@@ -6042,4 +6045,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1404 2001/07/18 15:45:44 mouring Exp $
+$Id: ChangeLog,v 1.1405 2001/07/18 15:48:57 mouring Exp $
diff --git a/serverloop.c b/serverloop.c
index 1db1c72..f826c6c 100644
--- a/serverloop.c
+++ b/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 @@
* 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 @@
else
server_init_dispatch_15();
}
-