[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 1622649b7a829fc8dc313042a43a974f0f3e8a99
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Wed Sep 21 19:53:12 2016 +0000

    upstream commit
    
    correctly return errors from kex_send_ext_info(). Fix from
    Sami Farin via https://github.com/openssh/openssh-portable/pull/50
    
    Upstream-ID: c85999af28aaecbf92cfa2283381df81e839b42c
---
 kex.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kex.c b/kex.c
index 8800d40..edb61be 100644
--- a/kex.c
+++ b/kex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.c,v 1.122 2016/09/19 19:02:19 markus Exp $ */
+/* $OpenBSD: kex.c,v 1.123 2016/09/21 19:53:12 djm Exp $ */
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  *
@@ -354,7 +354,7 @@ kex_send_ext_info(struct ssh *ssh)
 	r = 0;
  out:
 	free(algs);
-	return 0;
+	return r;
 }
 
 int

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