From 99bb7619d42476a98be48eae7a0237d6dc750cd3 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Fri, 13 Jun 2008 22:02:50 +1000 Subject: [PATCH] - deraadt@cvs.openbsd.org 2008/06/13 09:44:36 [packet.c] compile on older gcc; no decl after code --- ChangeLog | 8 +++++++- packet.c | 5 +++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c2818ecfe..81c36752c 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 9fd43ec68..90ad5ff67 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 * Copyright (c) 1995 Tatu Ylonen , 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));