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

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 @@
-/* $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);