From: Philip Hands <phil@hands.com>
Date: Wed, 31 Jul 2024 21:28:36 +0000 (+0200)
Subject: put the -i before -[pP] (matching man pages)
X-Git-Tag: V_9_9_P1~76
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0efa0e1c41427c0c6ba839a18c72c1afcd7b7cc0;p=thirdparty%2Fopenssh-portable.git

put the -i before -[pP] (matching man pages)

The man pages (ssh, sftp & ssh-copy-id) all list -i before the port
setting, so make the output match that order, which also seems more
natural with the port being next to the server.

SSH-Copy-ID-Upstream: 34d5d614172c78f9a42249466c4b81975b8883a1
---

diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index dfbdaa2f4..ac0db7b64 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}${SEEN_OPT_I:+ -i $PRIV_ID_FILE} ${OPTS_USER_HOST}"
+	Now try logging into the machine, with: "${SFTP:-ssh}${SEEN_OPT_I:+ -i $PRIV_ID_FILE}${SSH_PORT:+ -${PORT_OPT:-p} $SSH_PORT} ${OPTS_USER_HOST}"
 	and check to make sure that only the key(s) you wanted were added.
 
 	EOF