diff options
Diffstat (limited to 'channels.c')
-rw-r--r-- | channels.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/channels.c b/channels.c index e1c7be81f..47521d3e7 100644 --- a/channels.c +++ b/channels.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: channels.c,v 1.393 2019/06/28 13:35:04 deraadt Exp $ */ | 1 | /* $OpenBSD: channels.c,v 1.394 2019/07/07 01:05:00 dtucker 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 |
@@ -3277,7 +3277,6 @@ channel_input_status_confirm(int type, u_int32_t seq, struct ssh *ssh) | |||
3277 | int id = channel_parse_id(ssh, __func__, "status confirm"); | 3277 | int id = channel_parse_id(ssh, __func__, "status confirm"); |
3278 | Channel *c; | 3278 | Channel *c; |
3279 | struct channel_confirm *cc; | 3279 | struct channel_confirm *cc; |
3280 | int r; | ||
3281 | 3280 | ||
3282 | /* Reset keepalive timeout */ | 3281 | /* Reset keepalive timeout */ |
3283 | ssh_packet_set_alive_timeouts(ssh, 0); | 3282 | ssh_packet_set_alive_timeouts(ssh, 0); |
@@ -3290,7 +3289,7 @@ channel_input_status_confirm(int type, u_int32_t seq, struct ssh *ssh) | |||
3290 | } | 3289 | } |
3291 | if (channel_proxy_upstream(c, type, seq, ssh)) | 3290 | if (channel_proxy_upstream(c, type, seq, ssh)) |
3292 | return 0; | 3291 | return 0; |
3293 | if ((r = sshpkt_get_end(ssh)) != 0) | 3292 | if (sshpkt_get_end(ssh) != 0) |
3294 | ssh_packet_disconnect(ssh, "Invalid status confirm message"); | 3293 | ssh_packet_disconnect(ssh, "Invalid status confirm message"); |
3295 | if ((cc = TAILQ_FIRST(&c->status_confirms)) == NULL) | 3294 | if ((cc = TAILQ_FIRST(&c->status_confirms)) == NULL) |
3296 | return 0; | 3295 | return 0; |