summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2008-06-13 22:02:50 +1000
committerDarren Tucker <dtucker@zip.com.au>2008-06-13 22:02:50 +1000
commit99bb7619d42476a98be48eae7a0237d6dc750cd3 (patch)
tree214a0dc67a27878a8aeaff4c66eaf73985f5ae4f
parentf387e59d52151943130670d7eb52e1e77201ae6f (diff)
- deraadt@cvs.openbsd.org 2008/06/13 09:44:36
[packet.c] compile on older gcc; no decl after code
-rw-r--r--ChangeLog8
-rw-r--r--packet.c5
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 @@
120080613
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
120080612 720080612
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 $
diff --git a/packet.c b/packet.c
index 9fd43ec68..90ad5ff67 100644
--- a/packet.c
+++ b/packet.c
@@ -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