diff options
| author | Damien Miller <djm@mindrot.org> | 2010-06-18 11:09:24 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2010-06-18 11:09:24 +1000 |
| commit | ea909791c5cf297aa83d32af1c9df56e77c2e84a (patch) | |
| tree | 69a5449453a836e83ddd2aff8801f1862f49a57e | |
| parent | b9ae4ec556e6ee4cbe0c6cc7fb4ec9b9486cb8f7 (diff) | |
- (djm) [contrib/ssh-copy-id] Update key file explicitly under ~
rather than assuming that $CWD == $HOME. bz#1500, patch from
timothy AT gelter.com
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | contrib/ssh-copy-id | 5 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,8 @@ +20100618 + - (djm) [contrib/ssh-copy-id] Update key file explicitly under ~ + rather than assuming that $CWD == $HOME. bz#1500, patch from + timothy AT gelter.com + 20100617 - (tim) [contrib/cygwin/README] Remove a reference to the obsolete minires-devel package, and to add the reference to the libedit-devel diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id index 65c0a8cd..4c5493bd 100644 --- a/contrib/ssh-copy-id +++ b/contrib/ssh-copy-id @@ -38,13 +38,14 @@ 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 +{ eval "$GET_ID" ; } | ssh $1 "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: - .ssh/authorized_keys + ~/.ssh/authorized_keys to make sure we haven't added extra keys that you weren't expecting. EOF + |