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

diff --git a/kex.c b/kex.c
index 8800d4001a82e456b561691b57e8cc262c6fb2b0..edb61bee7080f9a7f70cf7714152b6c9afc1f6e5 100644 (file)
--- 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