diff options
author | Damien Miller <djm@mindrot.org> | 2011-08-12 11:22:47 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2011-08-12 11:22:47 +1000 |
commit | d1eb1dd5edf4960c1b4cbcda6cfc23462fe4f9fa (patch) | |
tree | a3c837e8a2b11ee6f878e4e85dbbadca1c186a8b | |
parent | 2db9977c061ff027bafa488c8e9afad505be773e (diff) | |
download | openssh-git-d1eb1dd5edf4960c1b4cbcda6cfc23462fe4f9fa.tar.gz |
- (djm) [contrib/ssh-copy-id] Fix failure for cases where the path to the
identify file contained whitespace. bz#1828 patch from gwenael.lambrouin
AT gmail.com; ok dtucker@
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | contrib/ssh-copy-id | 2 |
2 files changed, 5 insertions, 2 deletions
@@ -4,7 +4,10 @@ jchadima at redhat. - (djm) [contrib/redhat/openssh.spec contrib/redhat/sshd.init] [contrib/suse/openssh.spec contrib/suse/rc.sshd] Updated RHEL and SLES - init scrips from imorgan AT nas.nasa.gov + init scrips from imorgan AT nas.nasa.gov; bz#1920 + - (djm) [contrib/ssh-copy-id] Fix failure for cases where the path to the + identify file contained whitespace. bz#1828 patch from gwenael.lambrouin + AT gmail.com; ok dtucker@ 20110807 - (dtucker) OpenBSD CVS Sync diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id index 368645cb..eca7cf52 100644 --- a/contrib/ssh-copy-id +++ b/contrib/ssh-copy-id @@ -25,7 +25,7 @@ else fi if [ -z "`eval $GET_ID`" ] && [ -r "${ID_FILE}" ] ; then - GET_ID="cat ${ID_FILE}" + GET_ID="cat "${ID_FILE}\"" fi if [ -z "`eval $GET_ID`" ]; then |