RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream commit 

avoid trailing ',' in host key algorithms
This commit is contained in:
djm@openbsd.org 2015-01-18 13:33:34 +00:00 committed by Damien Miller
parent 7efb455789
commit 35d6022b55
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sshconnect2.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sshconnect2.c,v 1.215 2015/01/15 11:04:36 djm Exp $ */ /* $OpenBSD: sshconnect2.c,v 1.216 2015/01/18 13:33:34 djm Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
* Copyright (c) 2008 Damien Miller. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved.
@ -141,7 +141,8 @@ order_hostkeyalgs(char *host, struct sockaddr *hostaddr, u_short port)
ALG_APPEND(last, alg); ALG_APPEND(last, alg);
} }
#undef ALG_APPEND #undef ALG_APPEND
xasprintf(&ret, "%s%s%s", first, *first == '\0' ? "" : ",", last); xasprintf(&ret, "%s%s%s", first,
(*first == '\0' || *last == '\0') ? "" : ",", last);
if (*first != '\0') if (*first != '\0')
debug3("%s: prefer hostkeyalgs: %s", __func__, first); debug3("%s: prefer hostkeyalgs: %s", __func__, first);