summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Hands <phil@hands.com>2024-07-31 23:28:36 +0200
committerDarren Tucker <dtucker@dtucker.net>2024-08-17 03:19:27 +0200
commit0efa0e1c41427c0c6ba839a18c72c1afcd7b7cc0 (patch)
tree2730238ef3c1bb84b6d95fcabd2f4e8126bcf4b9
parentMinor space issue fixed (diff)
downloadopenssh-0efa0e1c41427c0c6ba839a18c72c1afcd7b7cc0.tar.xz
openssh-0efa0e1c41427c0c6ba839a18c72c1afcd7b7cc0.zip
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
Diffstat (limited to '')
-rw-r--r--contrib/ssh-copy-id2
1 files changed, 1 insertions, 1 deletions
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