tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream commit 

fix inverted test on channel open failure path that
"upgraded" a transient failure into a fatal error; reported by sthen and also
seen by benno@; ok sthen@

Upstream-ID: b58b3fbb79ba224599c6cd6b60c934fc46c68472
This commit is contained in:
djm@openbsd.org 2017-09-24 13:45:34 +00:00 committed by Damien Miller
parent c704f641f7
commit 218e6f98df
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
channels.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: channels.c,v 1.374 2017/09/24 09:50:01 djm Exp $ */ /* $OpenBSD: channels.c,v 1.375 2017/09/24 13:45:34 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -3126,7 +3126,7 @@ channel_input_open_failure(int type, u_int32_t seq, struct ssh *ssh)
if ((datafellows & SSH_BUG_OPENFAILURE) == 0) { if ((datafellows & SSH_BUG_OPENFAILURE) == 0) {
/* skip language */ /* skip language */
if ((r = sshpkt_get_cstring(ssh, &msg, NULL)) != 0 || if ((r = sshpkt_get_cstring(ssh, &msg, NULL)) != 0 ||
(r = sshpkt_get_string_direct(ssh, NULL, NULL)) == 0) { (r = sshpkt_get_string_direct(ssh, NULL, NULL)) != 0) {
error("%s: message/lang: %s", __func__, ssh_err(r)); error("%s: message/lang: %s", __func__, ssh_err(r));
packet_disconnect("Invalid open failure message"); packet_disconnect("Invalid open failure message");
} }