diff options
author | Colin Watson <cjwatson@debian.org> | 2011-01-24 11:46:57 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2011-01-24 11:46:57 +0000 |
commit | 0970072c89b079b022538e3c366fbfa2c53fc821 (patch) | |
tree | b7024712d74234bb5a8b036ccbc9109e2e211296 /ssh-agent.1 | |
parent | 4e8aa4da57000c7bba8e5c49163bc0c0ca383f78 (diff) | |
parent | 478ff799463ca926a8dfbabf058f4e84aaffc65a (diff) |
merge 5.7p1
Diffstat (limited to 'ssh-agent.1')
-rw-r--r-- | ssh-agent.1 | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/ssh-agent.1 b/ssh-agent.1 index f65e8e625..bb801c902 100644 --- a/ssh-agent.1 +++ b/ssh-agent.1 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: ssh-agent.1,v 1.50 2010/01/17 21:49:09 tedu Exp $ | 1 | .\" $OpenBSD: ssh-agent.1,v 1.53 2010/11/21 01:01:13 djm Exp $ |
2 | .\" | 2 | .\" |
3 | .\" Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | .\" Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -34,7 +34,7 @@ | |||
34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
36 | .\" | 36 | .\" |
37 | .Dd $Mdocdate: January 17 2010 $ | 37 | .Dd $Mdocdate: November 21 2010 $ |
38 | .Dt SSH-AGENT 1 | 38 | .Dt SSH-AGENT 1 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -42,18 +42,18 @@ | |||
42 | .Nd authentication agent | 42 | .Nd authentication agent |
43 | .Sh SYNOPSIS | 43 | .Sh SYNOPSIS |
44 | .Nm ssh-agent | 44 | .Nm ssh-agent |
45 | .Op Fl c Li | Fl s | 45 | .Op Fl c | s |
46 | .Op Fl d | 46 | .Op Fl d |
47 | .Op Fl a Ar bind_address | 47 | .Op Fl a Ar bind_address |
48 | .Op Fl t Ar life | 48 | .Op Fl t Ar life |
49 | .Op Ar command Op Ar arg ... | 49 | .Op Ar command Op Ar arg ... |
50 | .Nm ssh-agent | 50 | .Nm ssh-agent |
51 | .Op Fl c Li | Fl s | 51 | .Op Fl c | s |
52 | .Fl k | 52 | .Fl k |
53 | .Sh DESCRIPTION | 53 | .Sh DESCRIPTION |
54 | .Nm | 54 | .Nm |
55 | is a program to hold private keys used for public key authentication | 55 | is a program to hold private keys used for public key authentication |
56 | (RSA, DSA). | 56 | (RSA, DSA, ECDSA). |
57 | The idea is that | 57 | The idea is that |
58 | .Nm | 58 | .Nm |
59 | is started in the beginning of an X-session or a login session, and | 59 | is started in the beginning of an X-session or a login session, and |
@@ -72,7 +72,7 @@ Bind the agent to the | |||
72 | socket | 72 | socket |
73 | .Ar bind_address . | 73 | .Ar bind_address . |
74 | The default is | 74 | The default is |
75 | .Pa /tmp/ssh-XXXXXXXXXX/agent.\*(Ltppid\*(Gt . | 75 | .Pa $TMPDIR/ssh-XXXXXXXXXX/agent.\*(Ltppid\*(Gt . |
76 | .It Fl c | 76 | .It Fl c |
77 | Generate C-shell commands on | 77 | Generate C-shell commands on |
78 | .Dv stdout . | 78 | .Dv stdout . |
@@ -114,7 +114,8 @@ When executed without arguments, | |||
114 | .Xr ssh-add 1 | 114 | .Xr ssh-add 1 |
115 | adds the files | 115 | adds the files |
116 | .Pa ~/.ssh/id_rsa , | 116 | .Pa ~/.ssh/id_rsa , |
117 | .Pa ~/.ssh/id_dsa | 117 | .Pa ~/.ssh/id_dsa , |
118 | .Pa ~/.ssh/id_ecdsa | ||
118 | and | 119 | and |
119 | .Pa ~/.ssh/identity . | 120 | .Pa ~/.ssh/identity . |
120 | If the identity has a passphrase, | 121 | If the identity has a passphrase, |
@@ -187,9 +188,11 @@ line terminates. | |||
187 | Contains the protocol version 1 RSA authentication identity of the user. | 188 | Contains the protocol version 1 RSA authentication identity of the user. |
188 | .It Pa ~/.ssh/id_dsa | 189 | .It Pa ~/.ssh/id_dsa |
189 | Contains the protocol version 2 DSA authentication identity of the user. | 190 | Contains the protocol version 2 DSA authentication identity of the user. |
191 | .It Pa ~/.ssh/id_ecdsa | ||
192 | Contains the protocol version 2 ECDSA authentication identity of the user. | ||
190 | .It Pa ~/.ssh/id_rsa | 193 | .It Pa ~/.ssh/id_rsa |
191 | Contains the protocol version 2 RSA authentication identity of the user. | 194 | Contains the protocol version 2 RSA authentication identity of the user. |
192 | .It Pa /tmp/ssh-XXXXXXXXXX/agent.\*(Ltppid\*(Gt | 195 | .It Pa $TMPDIR/ssh-XXXXXXXXXX/agent.\*(Ltppid\*(Gt |
193 | .Ux Ns -domain | 196 | .Ux Ns -domain |
194 | sockets used to contain the connection to the authentication agent. | 197 | sockets used to contain the connection to the authentication agent. |
195 | These sockets should only be readable by the owner. | 198 | These sockets should only be readable by the owner. |