commit 1622649b7a829fc8dc313042a43a974f0f3e8a99
author djm@openbsd.org <djm@openbsd.org> Wed Sep 21 19:53:12 2016 +0000
committer Damien Miller <djm@mindrot.org> Thu Sep 22 05:59:35 2016 +1000
tree 304066747fd4c81da549f6bc83ba6259e81dd7f5
parent f83a0cfe16c7a73627b46a9a94e40087d60f32fb

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

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 @@
 	r = 0;
  out:
 	free(algs);
-	return 0;
+	return r;
 }
 
 int