diff options
author | djm@openbsd.org <djm@openbsd.org> | 2015-01-18 13:33:34 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-01-20 00:20:00 +1100 |
commit | 35d6022b55b7969fc10c261cb6aa78cc4a5fcc41 (patch) | |
tree | f1e988efded24b74475c03d3496b4352ba154ae4 /sshconnect2.c | |
parent | 7efb455789a0cb76bdcdee91c6060a3dc8f5c007 (diff) |
upstream commit
avoid trailing ',' in host key algorithms
Diffstat (limited to 'sshconnect2.c')
-rw-r--r-- | sshconnect2.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index 9265ca4a5..aee49a478 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect2.c,v 1.215 2015/01/15 11:04:36 djm Exp $ */ | 1 | /* $OpenBSD: sshconnect2.c,v 1.216 2015/01/18 13:33:34 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2008 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2008 Damien Miller. All rights reserved. |
@@ -141,7 +141,8 @@ order_hostkeyalgs(char *host, struct sockaddr *hostaddr, u_short port) | |||
141 | ALG_APPEND(last, alg); | 141 | ALG_APPEND(last, alg); |
142 | } | 142 | } |
143 | #undef ALG_APPEND | 143 | #undef ALG_APPEND |
144 | xasprintf(&ret, "%s%s%s", first, *first == '\0' ? "" : ",", last); | 144 | xasprintf(&ret, "%s%s%s", first, |
145 | (*first == '\0' || *last == '\0') ? "" : ",", last); | ||
145 | if (*first != '\0') | 146 | if (*first != '\0') |
146 | debug3("%s: prefer hostkeyalgs: %s", __func__, first); | 147 | debug3("%s: prefer hostkeyalgs: %s", __func__, first); |
147 | 148 | ||