diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2020-10-30 01:50:07 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2020-11-04 10:09:25 +1100 |
| commit | 7d680448db5858dc76307663f78d0b8d3c2b4a3d (patch) | |
| tree | 2273bbd0c19e2f310a5d548812afe5ff54721aea /sshconnect2.c | |
| parent | 95d1109fec7e89ad21f2a97e92bde1305d32a353 (diff) | |
| download | openssh-git-7d680448db5858dc76307663f78d0b8d3c2b4a3d.tar.gz | |
upstream: print reason in fatal error message when
kex_assemble_namelist() fails
OpenBSD-Commit-ID: a9975ee8db6c98d6f32233d88051b2077ca63dab
Diffstat (limited to 'sshconnect2.c')
| -rw-r--r-- | sshconnect2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index 87986346..46469a3b 100644 --- a/sshconnect2.c +++ b/sshconnect2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect2.c,v 1.332 2020/10/29 02:52:43 djm Exp $ */ +/* $OpenBSD: sshconnect2.c,v 1.333 2020/10/30 01:50:07 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved. @@ -227,9 +227,9 @@ ssh_kex2(struct ssh *ssh, char *host, struct sockaddr *hostaddr, u_short port) /* Expand or fill in HostkeyAlgorithms */ all_key = sshkey_alg_list(0, 0, 1, ','); - if (kex_assemble_names(&options.hostkeyalgorithms, - kex_default_pk_alg(), all_key) != 0) - fatal_f("kex_assemble_namelist"); + if ((r = kex_assemble_names(&options.hostkeyalgorithms, + kex_default_pk_alg(), all_key)) != 0) + fatal_fr(r, "kex_assemble_namelist"); free(all_key); if ((s = kex_names_cat(options.kex_algorithms, "ext-info-c")) == NULL) |