From: Shreyas Mahangade <smahanga@redhat.com>
Date: Mon, 29 Jul 2024 11:25:28 +0000 (+0530)
Subject: Show identity file in 'ssh' command
X-Git-Tag: V_9_9_P1~78
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f3010f4736b4b3f5c10a4be97a24e90ff04c5e7;p=thirdparty%2Fopenssh-portable.git

Show identity file in 'ssh' command

- Previously no identity file is shown in "ssh" command output on the line "Now try logging into the..."
- This commit makes sure whenever "ssh-copy-id" with "-i" is invoked, it also reflects in "ssh" command

SSH-Copy-ID-Upstream: 58e022ec26cb2315eb3be581d01e0ba787082428
---

diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index da6bd18dd..7156dddb0 100644
--- a/contrib/ssh-copy-id
+++ b/contrib/ssh-copy-id
@@ -379,7 +379,7 @@ else
 
 	Number of key(s) added: $ADDED
 
-	Now try logging into the machine, with:   "${SFTP:-ssh}${SSH_PORT:+ -${PORT_OPT:-p} $SSH_PORT} ${OPTS_USER_HOST}"
+	Now try logging into the machine, with: "${SFTP:-ssh}${SSH_PORT:+ -${PORT_OPT:-p} $SSH_PORT}${SEEN_OPT_I:+-i $PRIV_ID_FILE} ${OPTS_USER_HOST}"
 	and check to make sure that only the key(s) you wanted were added.
 
 	EOF