summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2003-09-23 19:00:41 +1000
committerDarren Tucker <dtucker@zip.com.au>2003-09-23 19:00:41 +1000
commit03575cc07de0c67586e56a5e1ee2d3a3ee35300c (patch)
tree4024c599e51c4520344bc0e58120a2f629f8ca3a
parenta05ec477b32c50aa793d865a231a3ec9d0ab1234 (diff)
- markus@cvs.openbsd.org 2003/09/19 09:02:02
[packet.c] buffer_dump only if PACKET_DEBUG is defined; Jedi/Sector One; pr 3471
-rw-r--r--ChangeLog5
-rw-r--r--packet.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index fd254c76..b49a8536 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,9 @@
[deattack.c misc.c session.c ssh-agent.c]
more buffer allocation fixes; from Solar Designer; CAN-2003-0682;
ok millert@
+ - markus@cvs.openbsd.org 2003/09/19 09:02:02
+ [packet.c]
+ buffer_dump only if PACKET_DEBUG is defined; Jedi/Sector One; pr 3471
20030922
- (dtucker) [Makefile.in] Bug #644: Fix "make clean" for out-of-tree
@@ -1175,4 +1178,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
-$Id: ChangeLog,v 1.2994.2.30 2003/09/23 08:59:08 dtucker Exp $
+$Id: ChangeLog,v 1.2994.2.31 2003/09/23 09:00:41 dtucker Exp $
diff --git a/packet.c b/packet.c
index 4ef639fd..02b629f3 100644
--- a/packet.c
+++ b/packet.c
@@ -37,7 +37,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: packet.c,v 1.109 2003/07/10 14:42:28 markus Exp $");
+RCSID("$OpenBSD: packet.c,v 1.110 2003/09/19 09:02:02 markus Exp $");
#include "openbsd-compat/sys-queue.h"
@@ -1020,7 +1020,9 @@ packet_read_poll2(u_int32_t *seqnr_p)
cp = buffer_ptr(&incoming_packet);
packet_length = GET_32BIT(cp);
if (packet_length < 1 + 4 || packet_length > 256 * 1024) {
+#ifdef PACKET_DEBUG
buffer_dump(&incoming_packet);
+#endif
packet_disconnect("Bad packet length %u.", packet_length);
}
DBG(debug("input: packet len %u", packet_length+4));