[openssh-commits] [openssh] 01/01: upstream commit

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 218e6f98df566fb9bd363f6aa47018cb65ede196
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Sun Sep 24 13:45:34 2017 +0000

    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
---
 channels.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/channels.c b/channels.c
index 6a55d3bf..83442be0 100644
--- a/channels.c
+++ b/channels.c
@@ -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 at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at 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) {
 		/* skip language */
 		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));
 			packet_disconnect("Invalid open failure message");
 		}

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.