From 1622649b7a829fc8dc313042a43a974f0f3e8a99 Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Wed, 21 Sep 2016 19:53:12 +0000 Subject: [PATCH] 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 8800d4001..edb61bee7 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