summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-06-18 03:09:24 +0200
committerDamien Miller <djm@mindrot.org>2010-06-18 03:09:24 +0200
commitea909791c5cf297aa83d32af1c9df56e77c2e84a (patch)
tree69a5449453a836e83ddd2aff8801f1862f49a57e /contrib
parent - (tim) [contrib/cygwin/README] Remove a reference to the obsolete (diff)
downloadopenssh-ea909791c5cf297aa83d32af1c9df56e77c2e84a.tar.xz
openssh-ea909791c5cf297aa83d32af1c9df56e77c2e84a.zip
- (djm) [contrib/ssh-copy-id] Update key file explicitly under ~
rather than assuming that $CWD == $HOME. bz#1500, patch from timothy AT gelter.com
Diffstat (limited to 'contrib')
-rw-r--r--contrib/ssh-copy-id5
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index 65c0a8cd8..4c5493bd0 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
+