diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2010-08-10 13:36:09 +1000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2010-08-10 13:36:09 +1000 |
| commit | 02c47341a2d0bd03411f6e00c74fb7ddd9b03986 (patch) | |
| tree | 390c615ca18759c03af9257d7a8193b118494cf2 | |
| parent | 2c4b13aa32cbe05801857d3a1a0080d8b0030155 (diff) | |
- (dtucker) bug #1530: strip trailing ":" from hostname in ssh-copy-id.
based in part on a patch from Colin Watson, ok djm@
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | contrib/ssh-copy-id | 7 |
2 files changed, 7 insertions, 2 deletions
@@ -2,6 +2,8 @@ - (djm) bz#1561: don't bother setting IFF_UP on tun(4) device if it is already set. Makes FreeBSD user openable tunnels useful; patch from richard.burakowski+ossh AT mrburak.net, ok dtucker@ + - (dtucker) bug #1530: strip trailing ":" from hostname in ssh-copy-id. + based in part on a patch from Colin Watson, ok djm@ 20100809 - OpenBSD CVS Sync diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id index 4c5493bd..368645cb 100644 --- a/contrib/ssh-copy-id +++ b/contrib/ssh-copy-id @@ -38,10 +38,13 @@ if [ "$#" -lt 1 ] || [ "$1" = "-h" ] || [ "$1" = "--help" ]; then exit 1 fi -{ eval "$GET_ID" ; } | ssh $1 "umask 077; test -d ~/.ssh || mkdir ~/.ssh ; cat >> ~/.ssh/authorized_keys" || exit 1 +# strip any trailing colon +host=`echo $1 | sed 's/:$//'` + +{ eval "$GET_ID" ; } | ssh $host "umask 077; test -d ~/.ssh || mkdir ~/.ssh ; cat >> ~/.ssh/authorized_keys" || exit 1 cat <<EOF -Now try logging into the machine, with "ssh '$1'", and check in: +Now try logging into the machine, with "ssh '$host'", and check in: ~/.ssh/authorized_keys |