RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

[packet.c] unbreak protocol keepalive timeouts bz#1465; ok dtucker@
This commit is contained in:
Darren Tucker 2008-06-08 12:49:30 +10:00
parent 5b2e2ba9e4
commit 136e56f689
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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 $

7
packet.c
View File

@ -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");