From 2c5b1791b5c22cd3ca76270e82f5f2d122bb0f30 Mon Sep 17 00:00:00 2001
From: mouring <mouring>
Date: Wed, 18 Jul 2001 15:48:57 +0000
Subject: [PATCH]    - markus@cvs.openbsd.org 2001/07/15 16:17:08     
 [serverloop.c]      schedule client alive for ssh2 only,
 greg@cheers.bungi.com

---
 ChangeLog    | 9 ++++++---
 serverloop.c | 9 ++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 18cacaf7..7edc3ad5 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
diff --git a/serverloop.c b/serverloop.c
index 1db1c725..f826c6cb 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 @@ 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();
 }
-
-- 
2.45.1