View | Details | Raw Unified | Return to bug 1492
Collapse All | Expand All

(-)file_not_specified_in_diff (-6 / +6 lines)
Line  Link Here
0 
-- openssh-5.1p1.orig/contrib/ssh-copy-id.1
 0 
++ openssh-5.1p1/contrib/ssh-copy-id.1
Lines 18-24 Link Here
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
21 
ssh-copy-id \- install your identity.pub in a remote machine's authorized_keys
 21 
ssh-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"
Lines 42-48 Link Here
42 
If the
 42 
If the
43 
.B -i
 43 
.B -i
44 
option is given then the identity file (defaults to
 44 
option is given then the identity file (defaults to
45 
.BR ~/.ssh/identity.pub )
 45 
.BR ~/.ssh/id_rsa.pub )
46 
is used, regardless of whether there are any keys in your
 46 
is used, regardless of whether there are any keys in your
47 
.BR ssh-agent .
 47 
.BR ssh-agent .
48 
Otherwise, if this:
 48 
Otherwise, if this:
49 
-- openssh-5.1p1.orig/contrib/ssh-copy-id
 49 
++ openssh-5.1p1/contrib/ssh-copy-id
Lines 1-11 Link Here
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
          

        

          
            

              8
              
ID_FILE="${HOME}/.ssh/identity.pub"


              8
              
ID_FILE="${HOME}/.ssh/id_rsa.pub"

            

        

          9
          

          9
          

        

        

          10
          
if [ "-i" = "$1" ]; then

          10
          
if [ "-i" = "$1" ]; then

        

        

          11
          
  shift

          11
          
  shift

        






  

  Return to bug 1492