- djm@cvs.openbsd.org 2008/05/19 06:14:02

     [packet.c] unbreak protocol keepalive timeouts bz#1465; ok dtucker@

2 files changed, 8 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 34cf9f2f1..e911254e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
  - (dtucker) [mux.c] Include paths.h inside ifdef HAVE_PATHS_H.
  - (dtucker) [configure.ac defines.h sftp-client.c sftp-server.c sftp.c]
    Do not enable statvfs extensions on platforms that do not have statvfs.
+ - (dtucker) OpenBSD CVS Sync
+   - djm@cvs.openbsd.org 2008/05/19 06:14:02
+     [packet.c] unbreak protocol keepalive timeouts bz#1465; ok dtucker@
 
 20080604
  - (djm) [openbsd-compat/bsd-arc4random.c] Fix math bug that caused bias
@@ -4033,4 +4036,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4938 2008/06/07 23:25:28 dtucker Exp $
+$Id: ChangeLog,v 1.4939 2008/06/08 02:49:30 dtucker Exp $
diff --git a/packet.c b/packet.c
index a34c040d6..c0e91b2d6 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.152 2008/05/08 06:59:01 markus Exp $ */
+/* $OpenBSD: packet.c,v 1.153 2008/05/19 06:14:02 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1194,9 +1194,10 @@ packet_read_poll_seqnr(u_int32_t *seqnr_p)
         for (;;) {
                 if (compat20) {
                         type = packet_read_poll2(seqnr_p);
-                        keep_alive_timeouts = 0;
-                        if (type)
+                        if (type) {
+                                keep_alive_timeouts = 0;
                                 DBG(debug("received packet type %d", type));
+                        }
                         switch (type) {
                         case SSH2_MSG_IGNORE:
                                 debug3("Received SSH2_MSG_IGNORE");