diff options
author | djm@openbsd.org <djm@openbsd.org> | 2016-09-21 19:53:12 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2016-09-22 05:59:35 +1000 |
commit | 1622649b7a829fc8dc313042a43a974f0f3e8a99 (patch) | |
tree | 304066747fd4c81da549f6bc83ba6259e81dd7f5 /kex.c | |
parent | f83a0cfe16c7a73627b46a9a94e40087d60f32fb (diff) |
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
Diffstat (limited to 'kex.c')
-rw-r--r-- | kex.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kex.c,v 1.122 2016/09/19 19:02:19 markus Exp $ */ | 1 | /* $OpenBSD: kex.c,v 1.123 2016/09/21 19:53:12 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -354,7 +354,7 @@ kex_send_ext_info(struct ssh *ssh) | |||
354 | r = 0; | 354 | r = 0; |
355 | out: | 355 | out: |
356 | free(algs); | 356 | free(algs); |
357 | return 0; | 357 | return r; |
358 | } | 358 | } |
359 | 359 | ||
360 | int | 360 | int |