summaryrefslogtreecommitdiff
path: root/ssh-keygen.c
diff options
context:
space:
mode:
authorclaudio@openbsd.org <claudio@openbsd.org>2020-01-22 04:51:51 +0000
committerDamien Miller <djm@mindrot.org>2020-01-22 17:17:51 +1100
commit4a32c0ca44a2dc2a358f69b5d43c08e528b44b39 (patch)
tree42a1e0df3c04fd959655e8956f313430498094f7 /ssh-keygen.c
parent37d3b736506760e4ebc7fe56255f7b8ea823a00c (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.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c
index ecfea8c2..04492979 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.384 2020/01/21 11:06:09 djm Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.385 2020/01/22 04:51:51 claudio Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* 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)
if (fp == NULL || ra == NULL)
fatal("%s: sshkey_fingerprint failed",
__func__);
- mprintf("%s %s %s %s\n", ctx->host,
- sshkey_type(l->key), fp, l->comment);
+ mprintf("%s %s %s%s%s\n", ctx->host,
+ sshkey_type(l->key), fp,
+ l->comment[0] ? " " : "",
+ l->comment);
if (log_level_get() >= SYSLOG_LEVEL_VERBOSE)
printf("%s\n", ra);
free(ra);