summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2010-07-19 21:24:13 +1000
committerDarren Tucker <dtucker@zip.com.au>2010-07-19 21:24:13 +1000
commit12b29dbd8a439b7de6bd7c30bf9b03539ac2e105 (patch)
tree33aea98a901f888faf481a30ddf01c82798487eb
parentbad5e03bfdcfd0ae3b5f6812affd8c2cf62d6046 (diff)
- (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.
-rw-r--r--ChangeLog5
-rw-r--r--contrib/ssh-copy-id.134
2 files changed, 26 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 322bb9d97..900999d7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
120100919
2 - (dtucker) [contrib/ssh-copy-ud.1] Bug #1786: update ssh-copy-id.1 with more
3 details about its behaviour WRT existing directories. Patch from
4 asguthrie at gmail com, ok djm.
5
120100716 620100716
2 - (djm) OpenBSD CVS Sync 7 - (djm) OpenBSD CVS Sync
3 - djm@cvs.openbsd.org 2010/07/02 04:32:44 8 - djm@cvs.openbsd.org 2010/07/02 04:32:44
diff --git a/contrib/ssh-copy-id.1 b/contrib/ssh-copy-id.1
index f25ed01f2..cb15ab24d 100644
--- a/contrib/ssh-copy-id.1
+++ b/contrib/ssh-copy-id.1
@@ -25,19 +25,10 @@ ssh-copy-id \- install your public key in a remote machine's authorized_keys
25.br 25.br
26.SH DESCRIPTION 26.SH DESCRIPTION
27.BR ssh-copy-id 27.BR ssh-copy-id
28is a script that uses ssh to log into a remote machine (presumably 28is a script that uses ssh to log into a remote machine and
29using a login password, so password authentication should be enabled, 29append the indicated identity file to that machine's
30unless you've done some clever use of multiple identities)
31.PP
32It also changes the permissions of the remote user's home,
33.BR ~/.ssh ,
34and
35.B ~/.ssh/authorized_keys 30.B ~/.ssh/authorized_keys
36to remove group writability (which would otherwise prevent you from logging in, if the remote 31file.
37.B sshd
38has
39.B StrictModes
40set in its configuration).
41.PP 32.PP
42If the 33If the
43.B -i 34.B -i
@@ -59,7 +50,24 @@ produced no output, then it uses the contents of the identity
59file. Once it has one or more fingerprints (by whatever means) it 50file. Once it has one or more fingerprints (by whatever means) it
60uses ssh to append them to 51uses ssh to append them to
61.B ~/.ssh/authorized_keys 52.B ~/.ssh/authorized_keys
62on the remote machine (creating the file, and directory, if necessary) 53on the remote machine (creating the file, and directory, if necessary.)
54
55.SH NOTES
56This program does not modify the permissions of any
57pre-existing files or directories. Therefore, if the remote
58.B sshd
59has
60.B StrictModes
61set in its
62configuration, then the user's home,
63.B ~/.ssh
64folder, and
65.B ~/.ssh/authorized_keys
66file may need to have group writability disabled manually, e.g. via
67
68.B " chmod go-w ~ ~/.ssh ~/.ssh/authorized_keys"
69
70on the remote machine.
63 71
64.SH "SEE ALSO" 72.SH "SEE ALSO"
65.BR ssh (1), 73.BR ssh (1),