- (djm) [contrib/ssh-copy-id] Update key file explicitly under ~

rather than assuming that $CWD == $HOME. bz#1500, patch from
   timothy AT gelter.com
This commit is contained in:
Damien Miller 2010-06-18 11:09:24 +10:00
parent b9ae4ec556
commit ea909791c5
2 changed files with 8 additions and 2 deletions

View File

@ -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 20100617
- (tim) [contrib/cygwin/README] Remove a reference to the obsolete - (tim) [contrib/cygwin/README] Remove a reference to the obsolete
minires-devel package, and to add the reference to the libedit-devel minires-devel package, and to add the reference to the libedit-devel

View File

@ -38,13 +38,14 @@ if [ "$#" -lt 1 ] || [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
exit 1 exit 1
fi 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 cat <<EOF
Now try logging into the machine, with "ssh '$1'", and check in: 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. to make sure we haven't added extra keys that you weren't expecting.
EOF EOF