commit 12b29dbd8a439b7de6bd7c30bf9b03539ac2e105
author Darren Tucker <dtucker@zip.com.au> Mon Jul 19 21:24:13 2010 +1000
committer Darren Tucker <dtucker@zip.com.au> Mon Jul 19 21:24:13 2010 +1000
tree 33aea98a901f888faf481a30ddf01c82798487eb
parent bad5e03bfdcfd0ae3b5f6812affd8c2cf62d6046

 - (dtucker) [contrib/ssh-copy-ud.1] Bug #1786: update ssh-copy-id.1 with more
   details about its behaviour WRT existing directories.  Patch from
   asguthrie at gmail com, ok djm.

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 322bb9d..900999d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20100919
+ - (dtucker) [contrib/ssh-copy-ud.1] Bug #1786: update ssh-copy-id.1 with more
+   details about its behaviour WRT existing directories.  Patch from
+   asguthrie at gmail com, ok djm.
+
 20100716
  - (djm) OpenBSD CVS Sync
    - djm@cvs.openbsd.org 2010/07/02 04:32:44

contrib/ssh-copy-id.1

diff --git a/contrib/ssh-copy-id.1 b/contrib/ssh-copy-id.1
index f25ed01..cb15ab2 100644
--- a/contrib/ssh-copy-id.1
+++ b/contrib/ssh-copy-id.1
@@ -25,19 +25,10 @@
 .br
 .SH DESCRIPTION
 .BR ssh-copy-id
-is a script that uses ssh to log into a remote machine (presumably
-using a login password, so password authentication should be enabled,
-unless you've done some clever use of multiple identities)
-.PP
-It also changes the permissions of the remote user's home,
-.BR ~/.ssh ,
-and
+is a script that uses ssh to log into a remote machine and
+append the indicated identity file to that machine's
 .B ~/.ssh/authorized_keys
-to remove group writability (which would otherwise prevent you from logging in, if the remote
-.B sshd
-has
-.B StrictModes
-set in its configuration).
+file.
 .PP
 If the
 .B -i
@@ -59,7 +50,24 @@
 file.  Once it has one or more fingerprints (by whatever means) it
 uses ssh to append them to
 .B ~/.ssh/authorized_keys
-on the remote machine (creating the file, and directory, if necessary)
+on the remote machine (creating the file, and directory, if necessary.)
+
+.SH NOTES
+This program does not modify the permissions of any
+pre-existing files or directories. Therefore, if the remote
+.B sshd
+has
+.B StrictModes
+set in its
+configuration, then the user's home,
+.B ~/.ssh
+folder, and
+.B ~/.ssh/authorized_keys
+file may need to have group writability disabled manually, e.g. via
+
+.B "      chmod go-w ~ ~/.ssh ~/.ssh/authorized_keys"
+
+on the remote machine.
 
 .SH "SEE ALSO"
 .BR ssh (1),