summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2017-05-08 00:21:36 +0000
committerDamien Miller <djm@mindrot.org>2017-05-08 10:23:17 +1000
commit7461a5bc571696273252df28a1f1578968cae506 (patch)
tree26a1094047931b3110870512e6dc10b945c9011a
parentbd636f40911094a39c2920bf87d2ec340533c152 (diff)
upstream commit
I was too aggressive with the scalpel in the last commit; unbreak sshd, spotted quickly by naddy@ Upstream-ID: fb7e75d2b2c7e6ca57dee00ca645e322dd49adbf
-rw-r--r--packet.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/packet.c b/packet.c
index ec0eb0cd3..083c475a0 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: packet.c,v 1.254 2017/05/07 23:12:57 djm Exp $ */ 1/* $OpenBSD: packet.c,v 1.255 2017/05/08 00:21:36 djm 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
@@ -2237,8 +2237,9 @@ ssh_packet_get_state(struct ssh *ssh, struct sshbuf *m)
2237 (r = sshbuf_put_u32(m, state->p_read.seqnr)) != 0 || 2237 (r = sshbuf_put_u32(m, state->p_read.seqnr)) != 0 ||
2238 (r = sshbuf_put_u64(m, state->p_read.blocks)) != 0 || 2238 (r = sshbuf_put_u64(m, state->p_read.blocks)) != 0 ||
2239 (r = sshbuf_put_u32(m, state->p_read.packets)) != 0 || 2239 (r = sshbuf_put_u32(m, state->p_read.packets)) != 0 ||
2240 (r = sshbuf_put_u64(m, state->p_read.bytes)) != 0) 2240 (r = sshbuf_put_u64(m, state->p_read.bytes)) != 0 ||
2241 return r; 2241 (r = sshbuf_put_stringb(m, state->input)) != 0 ||
2242 (r = sshbuf_put_stringb(m, state->output)) != 0)
2242 2243
2243 return 0; 2244 return 0;
2244} 2245}