RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-02-27 03:11:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

restore optionality of -i's argument

Browse Source 
SSH-Copy-ID-Upstream: f70e3abb510e4eeb040b47894e41828246c1b720
This commit is contained in:
Philip Hands 2024-08-04 20:45:00 +02:00 committed by Darren Tucker
parent c37aa7012b
commit 7fc9ccdce1
No known key found for this signature in database
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
contrib/ssh-copy-id
View File

@ -114,7 +114,9 @@ if [ -n "$SSH_AUTH_SOCK" ] && ssh-add -L >/dev/null 2>&1 ; then
GET_ID="ssh-add -L"
fi
while getopts "i:o:p:F:t:fnsxh?" OPT
OPTS="io:p:F:t:fnsxh?"
while getopts "$OPTS" OPT
do
case "$OPT" in
i)
@ -123,6 +125,20 @@ do
usage
}
SEEN_OPT_I="yes"
# Check for -i's optional parameter
eval "nextarg=\${$OPTIND}"
# shellcheck disable=SC2154
if [ $OPTIND = $# ]; then
if [ -r "$nextarg" ] && grep -iq ssh "$nextarg"; then
printf '\n%s: ERROR: Missing hostname. Use "-i -- %s" if you really mean to use this as the hostname\n\n' "$0" "$nextarg" >&2
usage
fi
elif ! expr -- "$nextarg" : "-[$(echo "$OPTS" | tr -d :)-]" >/dev/null ; then
# when not at the last arg, and not followed by an option, -i has an argument
OPTARG="$nextarg"
OPTIND=$((OPTIND + 1))
fi
use_id_file "${OPTARG:-$DEFAULT_PUB_ID_FILE}"
;;
o|F)

2
contrib/ssh-copy-id.1
View File

@ -67,7 +67,7 @@ command instead.
.Pp
The options are as follows:
.Bl -tag -width Ds
.It Fl i Ar identity_file
.It Fl i Op Ar identity_file
Use only the key(s) contained in
.Ar identity_file
(rather than looking for identities via