summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2009-01-21 20:29:20 +1100
committerDamien Miller <djm@mindrot.org>2009-01-21 20:29:20 +1100
commit0266677f0feb72b092f87480a4c8695c71db9684 (patch)
treea8f52f5b2896d85942c7685a764ea3b986c6de7b
parent819dbb633af6e1970c6b3275882c85d458441500 (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
-rw-r--r--ChangeLog5
-rw-r--r--contrib/ssh-copy-id4
-rw-r--r--contrib/ssh-copy-id.14
3 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index f2c556c1a..d19ae7235 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
4 - (djm) [channels.c] bz#1419: support "on demand" X11 forwarding via 4 - (djm) [channels.c] bz#1419: support "on demand" X11 forwarding via
5 launchd on OS X; patch from vgiffin AT apple.com, slightly tweaked; 5 launchd on OS X; patch from vgiffin AT apple.com, slightly tweaked;
6 ok dtucker@ 6 ok dtucker@
7 - (djm) [contrib/ssh-copy-id.1 contrib/ssh-copy-id] bz#1492: Make
8 ssh-copy-id copy id_rsa.pub by default (instead of the legacy "identity"
9 key). Patch from cjwatson AT debian.org
7 10
820090107 1120090107
9 - (tim) [configure.ac defines.h openbsd-compat/port-uw.c 12 - (tim) [configure.ac defines.h openbsd-compat/port-uw.c
@@ -5003,5 +5006,5 @@
5003 OpenServer 6 and add osr5bigcrypt support so when someone migrates 5006 OpenServer 6 and add osr5bigcrypt support so when someone migrates
5004 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 5007 passwords between UnixWare and OpenServer they will still work. OK dtucker@
5005 5008
5006$Id: ChangeLog,v 1.5159 2009/01/21 05:46:26 djm Exp $ 5009$Id: ChangeLog,v 1.5160 2009/01/21 09:29:20 djm Exp $
5007 5010
diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index acd36d398..df74d25c8 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: