diff options
| author | Damien Miller <djm@mindrot.org> | 2009-01-21 20:29:20 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2009-01-21 20:29:20 +1100 |
| commit | 0266677f0feb72b092f87480a4c8695c71db9684 (patch) | |
| tree | a8f52f5b2896d85942c7685a764ea3b986c6de7b /contrib | |
| parent | 819dbb633af6e1970c6b3275882c85d458441500 (diff) | |
- (djm) [contrib/ssh-copy-id.1 contrib/ssh-copy-id] bz#1492: Make
ssh-copy-id copy id_rsa.pub by default (instead of the legacy "identity"
key). Patch from cjwatson AT debian.org
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/ssh-copy-id | 4 | ||||
| -rw-r--r-- | contrib/ssh-copy-id.1 | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id index acd36d39..df74d25c 100644 --- a/contrib/ssh-copy-id +++ b/contrib/ssh-copy-id @@ -1,11 +1,11 @@ #!/bin/sh -# Shell script to install your identity.pub on a remote machine +# Shell script to install your public key on a remote machine # Takes the remote machine name as an argument. # Obviously, the remote machine must accept password authentication, # or one of the other keys in your ssh-agent, for this to work. -ID_FILE="${HOME}/.ssh/identity.pub" +ID_FILE="${HOME}/.ssh/id_rsa.pub" if [ "-i" = "$1" ]; then shift diff --git a/contrib/ssh-copy-id.1 b/contrib/ssh-copy-id.1 index b331fa14..f25ed01f 100644 --- a/contrib/ssh-copy-id.1 +++ b/contrib/ssh-copy-id.1 @@ -18,7 +18,7 @@ the original English. .. .TH SSH-COPY-ID 1 "14 November 1999" "OpenSSH" .SH NAME -ssh-copy-id \- install your identity.pub in a remote machine's authorized_keys +ssh-copy-id \- install your public key in a remote machine's authorized_keys .SH SYNOPSIS .B ssh-copy-id [-i [identity_file]] .I "[user@]machine" @@ -42,7 +42,7 @@ set in its configuration). If the .B -i option is given then the identity file (defaults to -.BR ~/.ssh/identity.pub ) +.BR ~/.ssh/id_rsa.pub ) is used, regardless of whether there are any keys in your .BR ssh-agent . Otherwise, if this: |