tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-30 01:05:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

- (djm) [contrib/ssh-copy-id.1 contrib/ssh-copy-id] bz#1492: Make

Browse Source 
ssh-copy-id copy id_rsa.pub by default (instead of the legacy "identity"
   key). Patch from cjwatson AT debian.org
This commit is contained in:
Damien Miller 2009-01-21 20:29:20 +11:00
parent 819dbb633a
commit 0266677f0f
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -4,6 +4,9 @@
- (djm) [channels.c] bz#1419: support "on demand" X11 forwarding via - (djm) [channels.c] bz#1419: support "on demand" X11 forwarding via
launchd on OS X; patch from vgiffin AT apple.com, slightly tweaked; launchd on OS X; patch from vgiffin AT apple.com, slightly tweaked;
ok dtucker@ ok dtucker@
- (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
20090107 20090107
- (tim) [configure.ac defines.h openbsd-compat/port-uw.c - (tim) [configure.ac defines.h openbsd-compat/port-uw.c
@ -5003,5 +5006,5 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.5159 2009/01/21 05:46:26 djm Exp $ $Id: ChangeLog,v 1.5160 2009/01/21 09:29:20 djm Exp $

4
contrib/ssh-copy-id
View File

@ -1,11 +1,11 @@
#!/bin/sh #!/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. # Takes the remote machine name as an argument.
# Obviously, the remote machine must accept password authentication, # Obviously, the remote machine must accept password authentication,
# or one of the other keys in your ssh-agent, for this to work. # 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 if [ "-i" = "$1" ]; then
shift shift

4
contrib/ssh-copy-id.1
View File

@ -18,7 +18,7 @@ the original English.
.. ..
.TH SSH-COPY-ID 1 "14 November 1999" "OpenSSH" .TH SSH-COPY-ID 1 "14 November 1999" "OpenSSH"
.SH NAME .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 .SH SYNOPSIS
.B ssh-copy-id [-i [identity_file]] .B ssh-copy-id [-i [identity_file]]
.I "[user@]machine" .I "[user@]machine"
@ -42,7 +42,7 @@ set in its configuration).
If the If the
.B -i .B -i
option is given then the identity file (defaults to 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 is used, regardless of whether there are any keys in your
.BR ssh-agent . .BR ssh-agent .
Otherwise, if this: Otherwise, if this: