Import openssh_6.5p1.orig.tar.gz

1 files changed, 3 insertions, 2 deletions

diff --git a/serverloop.c b/serverloop.c
index ccbad617d..5b2f8028d 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: serverloop.c,v 1.168 2013/07/12 00:19:59 djm Exp $ */
+/* $OpenBSD: serverloop.c,v 1.169 2013/12/19 00:19:12 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -304,7 +304,8 @@ wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp, int *maxfdp,
         if (compat20 &&
             max_time_milliseconds == 0 && options.client_alive_interval) {
                 client_alive_scheduled = 1;
-                max_time_milliseconds = options.client_alive_interval * 1000;
+                max_time_milliseconds =
+                    (u_int64_t)options.client_alive_interval * 1000;
         }
 
         if (compat20) {