diff options
author | djm@openbsd.org <djm@openbsd.org> | 2017-09-24 13:45:34 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-09-24 23:46:12 +1000 |
commit | 218e6f98df566fb9bd363f6aa47018cb65ede196 (patch) | |
tree | 8a564aca12875309a3e743e38421fd304a2dcb22 | |
parent | c704f641f7b8777497dc82e81f2ac89afec7e401 (diff) |
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
-rw-r--r-- | channels.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels.c b/channels.c index 6a55d3bf3..83442be06 100644 --- a/channels.c +++ b/channels.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: channels.c,v 1.374 2017/09/24 09:50:01 djm Exp $ */ | 1 | /* $OpenBSD: channels.c,v 1.375 2017/09/24 13:45:34 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 |
@@ -3126,7 +3126,7 @@ channel_input_open_failure(int type, u_int32_t seq, struct ssh *ssh) | |||
3126 | if ((datafellows & SSH_BUG_OPENFAILURE) == 0) { | 3126 | if ((datafellows & SSH_BUG_OPENFAILURE) == 0) { |
3127 | /* skip language */ | 3127 | /* skip language */ |
3128 | if ((r = sshpkt_get_cstring(ssh, &msg, NULL)) != 0 || | 3128 | if ((r = sshpkt_get_cstring(ssh, &msg, NULL)) != 0 || |
3129 | (r = sshpkt_get_string_direct(ssh, NULL, NULL)) == 0) { | 3129 | (r = sshpkt_get_string_direct(ssh, NULL, NULL)) != 0) { |
3130 | error("%s: message/lang: %s", __func__, ssh_err(r)); | 3130 | error("%s: message/lang: %s", __func__, ssh_err(r)); |
3131 | packet_disconnect("Invalid open failure message"); | 3131 | packet_disconnect("Invalid open failure message"); |
3132 | } | 3132 | } |