summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--packet.c5
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c2818ecf..81c36752 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20080613
+ - (dtucker) OpenBSD CVS Sync
+ - deraadt@cvs.openbsd.org 2008/06/13 09:44:36
+ [packet.c]
+ compile on older gcc; no decl after code
+
20080612
- (dtucker) OpenBSD CVS Sync
- jmc@cvs.openbsd.org 2008/06/11 07:30:37
@@ -4335,4 +4341,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.5003 2008/06/13 05:03:14 dtucker Exp $
+$Id: ChangeLog,v 1.5004 2008/06/13 12:02:50 dtucker Exp $
diff --git a/packet.c b/packet.c
index 9fd43ec6..90ad5ff6 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.154 2008/06/12 20:38:28 dtucker Exp $ */
+/* $OpenBSD: packet.c,v 1.155 2008/06/13 09:44:36 deraadt Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -910,9 +910,10 @@ packet_read_seqnr(u_int32_t *seqnr_p)
int type, len, ret, ms_remain;
fd_set *setp;
char buf[8192];
- DBG(debug("packet_read()"));
struct timeval timeout, start, *timeoutp = NULL;
+ DBG(debug("packet_read()"));
+
setp = (fd_set *)xcalloc(howmany(connection_in+1, NFDBITS),
sizeof(fd_mask));