summaryrefslogtreecommitdiffstats
path: root/packet.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2012-12-12 21:18:59 +0100
committerDamien Miller <djm@mindrot.org>2012-12-12 21:18:59 +0100
commit8c05da3326fef892d993f0cd91808f2daf4d6a5f (patch)
tree2d93dd5498174ef217001ddf232dccdf4f42c6aa /packet.c
parent - (djm) [regress/Makefile] fix t-exec rule (diff)
downloadopenssh-8c05da3326fef892d993f0cd91808f2daf4d6a5f.tar.xz
openssh-8c05da3326fef892d993f0cd91808f2daf4d6a5f.zip
- markus@cvs.openbsd.org 2012/12/12 16:45:52
[packet.c] reset incoming_packet buffer for each new packet in EtM-case, too; this happens if packets are parsed only parially (e.g. ignore messages sent when su/sudo turn off echo); noted by sthen/millert
Diffstat (limited to 'packet.c')
-rw-r--r--packet.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/packet.c b/packet.c
index be8907854..fe379aa49 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.178 2012/12/11 22:31:18 markus Exp $ */
+/* $OpenBSD: packet.c,v 1.179 2012/12/12 16:45:52 markus Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1278,6 +1278,7 @@ packet_read_poll2(u_int32_t *seqnr_p)
logit("Bad packet length %u.", active_state->packlen);
packet_disconnect("Packet corrupt");
}
+ buffer_clear(&active_state->incoming_packet);
} else if (active_state->packlen == 0) {
/*
* check if input size is less than the cipher block size,