1 files changed, 6 insertions, 2 deletions

diff --git a/clientloop.c b/clientloop.c
index 8f4b6e1b0..5b76b9893 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.238 2012/01/18 21:46:43 dtucker Exp $ */
+/* $OpenBSD: clientloop.c,v 1.240 2012/06/20 04:42:58 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -592,10 +592,12 @@ client_wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp,
 {
         struct timeval tv, *tvp;
         int timeout_secs;
+        time_t minwait_secs = 0;
         int ret;
 
         /* Add any selections by the channel mechanism. */
-        channel_prepare_select(readsetp, writesetp, maxfdp, nallocp, rekeying);
+        channel_prepare_select(readsetp, writesetp, maxfdp, nallocp,
+            &minwait_secs, rekeying);
 
         if (!compat20) {
                 /* Read from the connection, unless our buffers are full. */
@@ -648,6 +650,8 @@ client_wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp,
                 if (timeout_secs < 0)
                         timeout_secs = 0;
         }
+        if (minwait_secs != 0)
+                timeout_secs = MIN(timeout_secs, (int)minwait_secs);
         if (timeout_secs == INT_MAX)
                 tvp = NULL;
         else {