summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2007-07-17 09:45:13 +0000
committerColin Watson <cjwatson@debian.org>2007-07-17 09:45:13 +0000
commit2273c301778d605624f170df4e8d05c8dcc38553 (patch)
tree5e0b4a5d16bd0c58e2b45719f2410bb9cab56eca
parent1fa67efd2da9b8332f6a62e253d046130692085e (diff)
* ssh-copy-id defaults to ~/.ssh/id_rsa.pub rather than
~/.ssh/identity.pub, in line with ssh-keygen (thanks, Greg Norris; closes: #234627).
-rw-r--r--contrib/ssh-copy-id4
-rw-r--r--contrib/ssh-copy-id.14
-rw-r--r--debian/changelog3
3 files changed, 7 insertions, 4 deletions
diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index 093fb2668..2c480e359 100644
--- a/contrib/ssh-copy-id
+++ b/contrib/ssh-copy-id
@@ -1,11 +1,11 @@
1#!/bin/sh 1#!/bin/sh
2 2
3# Shell script to install your identity.pub on a remote machine 3# Shell script to install your public key on a remote machine
4# Takes the remote machine name as an argument. 4# Takes the remote machine name as an argument.
5# Obviously, the remote machine must accept password authentication, 5# Obviously, the remote machine must accept password authentication,
6# or one of the other keys in your ssh-agent, for this to work. 6# or one of the other keys in your ssh-agent, for this to work.
7 7
8ID_FILE="${HOME}/.ssh/identity.pub" 8ID_FILE="${HOME}/.ssh/id_rsa.pub"
9 9
10if [ "-i" = "$1" ]; then 10if [ "-i" = "$1" ]; then
11 shift 11 shift
diff --git a/contrib/ssh-copy-id.1 b/contrib/ssh-copy-id.1
index b331fa149..f25ed01f2 100644
--- a/contrib/ssh-copy-id.1
+++ b/contrib/ssh-copy-id.1
@@ -18,7 +18,7 @@ the original English.
18.. 18..
19.TH SSH-COPY-ID 1 "14 November 1999" "OpenSSH" 19.TH SSH-COPY-ID 1 "14 November 1999" "OpenSSH"
20.SH NAME 20.SH NAME
21ssh-copy-id \- install your identity.pub in a remote machine's authorized_keys 21ssh-copy-id \- install your public key in a remote machine's authorized_keys
22.SH SYNOPSIS 22.SH SYNOPSIS
23.B ssh-copy-id [-i [identity_file]] 23.B ssh-copy-id [-i [identity_file]]
24.I "[user@]machine" 24.I "[user@]machine"
@@ -42,7 +42,7 @@ set in its configuration).
42If the 42If the
43.B -i 43.B -i
44option is given then the identity file (defaults to 44option is given then the identity file (defaults to
45.BR ~/.ssh/identity.pub ) 45.BR ~/.ssh/id_rsa.pub )
46is used, regardless of whether there are any keys in your 46is used, regardless of whether there are any keys in your
47.BR ssh-agent . 47.BR ssh-agent .
48Otherwise, if this: 48Otherwise, if this:
diff --git a/debian/changelog b/debian/changelog
index 2e6a25b5e..f1db99a80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ openssh (1:4.6p1-5) UNRELEASED; urgency=low
6 Simó; closes: #221675). 6 Simó; closes: #221675).
7 * ssh-copy-id no longer prints the output of expr (thanks, Peter 7 * ssh-copy-id no longer prints the output of expr (thanks, Peter
8 Eisentraut; closes: #291534). 8 Eisentraut; closes: #291534).
9 * ssh-copy-id defaults to ~/.ssh/id_rsa.pub rather than
10 ~/.ssh/identity.pub, in line with ssh-keygen (thanks, Greg Norris;
11 closes: #234627).
9 * debconf template translations: 12 * debconf template translations:
10 - Update Catalan (thanks, Jordà Polo; closes: #431970). 13 - Update Catalan (thanks, Jordà Polo; closes: #431970).
11 14