diff options
author | claudio@openbsd.org <claudio@openbsd.org> | 2020-01-22 04:51:51 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2020-01-22 17:17:51 +1100 |
commit | 4a32c0ca44a2dc2a358f69b5d43c08e528b44b39 (patch) | |
tree | 42a1e0df3c04fd959655e8956f313430498094f7 /ssh-keygen.c | |
parent | 37d3b736506760e4ebc7fe56255f7b8ea823a00c (diff) |
upstream: For ssh-keygen -lF only add a space after key fingerprint
when there is a comment. This makes copy-paste of fingerprints into ssh
easier. OK djm@
OpenBSD-Commit-ID: fa01d95624f65c1eb4dc7c575d20d77c78010dfd
Diffstat (limited to 'ssh-keygen.c')
-rw-r--r-- | ssh-keygen.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c index ecfea8c20..04492979b 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-keygen.c,v 1.384 2020/01/21 11:06:09 djm Exp $ */ | 1 | /* $OpenBSD: ssh-keygen.c,v 1.385 2020/01/22 04:51:51 claudio Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -1261,8 +1261,10 @@ known_hosts_find_delete(struct hostkey_foreach_line *l, void *_ctx) | |||
1261 | if (fp == NULL || ra == NULL) | 1261 | if (fp == NULL || ra == NULL) |
1262 | fatal("%s: sshkey_fingerprint failed", | 1262 | fatal("%s: sshkey_fingerprint failed", |
1263 | __func__); | 1263 | __func__); |
1264 | mprintf("%s %s %s %s\n", ctx->host, | 1264 | mprintf("%s %s %s%s%s\n", ctx->host, |
1265 | sshkey_type(l->key), fp, l->comment); | 1265 | sshkey_type(l->key), fp, |
1266 | l->comment[0] ? " " : "", | ||
1267 | l->comment); | ||
1266 | if (log_level_get() >= SYSLOG_LEVEL_VERBOSE) | 1268 | if (log_level_get() >= SYSLOG_LEVEL_VERBOSE) |
1267 | printf("%s\n", ra); | 1269 | printf("%s\n", ra); |
1268 | free(ra); | 1270 | free(ra); |