Bug#234627: /usr/bin/ssh-copy-id: Two years...easy fix...please?
tags 234627 patch
stop
Here's a patch which implements the requested change. Please note that
I defaulted to the RSA public key (id_rsa.pub) rather than DSA, as it
appears to be the preferred format now that the relevant patent has
expired. Should you prefer to go with DSA instead, only trivial
modifications are required.
diff -urN openssh-4.2p1.orig/contrib/ssh-copy-id openssh-4.2p1/contrib/ssh-copy-id
--- openssh-4.2p1.orig/contrib/ssh-copy-id 2004-08-30 06:33:02.000000000 -0500
+++ openssh-4.2p1/contrib/ssh-copy-id 2006-01-11 09:25:03.000000000 -0600
@@ -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 -urN openssh-4.2p1.orig/contrib/ssh-copy-id.1 openssh-4.2p1/contrib/ssh-copy-id.1
--- openssh-4.2p1.orig/contrib/ssh-copy-id.1 2000-12-28 09:46:20.000000000 -0600
+++ openssh-4.2p1/contrib/ssh-copy-id.1 2006-01-11 09:25:10.000000000 -0600
@@ -18,7 +18,7 @@
..
.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 @@
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:
Reply to: