diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | packet.c | 5 |
2 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,9 @@ | |||
1 | 20080613 | ||
2 | - (dtucker) OpenBSD CVS Sync | ||
3 | - deraadt@cvs.openbsd.org 2008/06/13 09:44:36 | ||
4 | [packet.c] | ||
5 | compile on older gcc; no decl after code | ||
6 | |||
1 | 20080612 | 7 | 20080612 |
2 | - (dtucker) OpenBSD CVS Sync | 8 | - (dtucker) OpenBSD CVS Sync |
3 | - jmc@cvs.openbsd.org 2008/06/11 07:30:37 | 9 | - jmc@cvs.openbsd.org 2008/06/11 07:30:37 |
@@ -4335,4 +4341,4 @@ | |||
4335 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 4341 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
4336 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 4342 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
4337 | 4343 | ||
4338 | $Id: ChangeLog,v 1.5003 2008/06/13 05:03:14 dtucker Exp $ | 4344 | $Id: ChangeLog,v 1.5004 2008/06/13 12:02:50 dtucker Exp $ |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: packet.c,v 1.154 2008/06/12 20:38:28 dtucker Exp $ */ | 1 | /* $OpenBSD: packet.c,v 1.155 2008/06/13 09:44:36 deraadt Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -910,9 +910,10 @@ packet_read_seqnr(u_int32_t *seqnr_p) | |||
910 | int type, len, ret, ms_remain; | 910 | int type, len, ret, ms_remain; |
911 | fd_set *setp; | 911 | fd_set *setp; |
912 | char buf[8192]; | 912 | char buf[8192]; |
913 | DBG(debug("packet_read()")); | ||
914 | struct timeval timeout, start, *timeoutp = NULL; | 913 | struct timeval timeout, start, *timeoutp = NULL; |
915 | 914 | ||
915 | DBG(debug("packet_read()")); | ||
916 | |||
916 | setp = (fd_set *)xcalloc(howmany(connection_in+1, NFDBITS), | 917 | setp = (fd_set *)xcalloc(howmany(connection_in+1, NFDBITS), |
917 | sizeof(fd_mask)); | 918 | sizeof(fd_mask)); |
918 | 919 | ||