diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2000-11-21 21:24:55 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2000-11-21 21:24:55 +0000 |
commit | 14920293713ff4a5bbe45b495694bfd925d73894 (patch) | |
tree | d0f63720bdcbc574dc3c018beeb28e6da4b5e1fb /ssh-agent.1 | |
parent | 4a1d91646d4248c111f573e496cc0d10ba62e274 (diff) |
20001123
- (bal) Merge OpenBSD changes:
- markus@cvs.openbsd.org 2000/11/15 22:31:36
[auth-options.c]
case insensitive key options; from stevesk@sweeden.hp.com
- markus@cvs.openbsd.org 2000/11/16 17:55:43
[dh.c]
do not use perror() in sshd, after child is forked()
- markus@cvs.openbsd.org 2000/11/14 23:42:40
[auth-rsa.c]
parse option only if key matches; fix some confusing seen by the client
- markus@cvs.openbsd.org 2000/11/14 23:44:19
[session.c]
check no_agent_forward_flag for ssh-2, too
- markus@cvs.openbsd.org 2000/11/15
[ssh-agent.1]
reorder SYNOPSIS; typo, use .It
- markus@cvs.openbsd.org 2000/11/14 23:48:55
[ssh-agent.c]
do not reorder keys if a key is removed
- markus@cvs.openbsd.org 2000/11/15 19:58:08
[ssh.c]
just ignore non existing user keys
- millert@cvs.openbsd.org 200/11/15 20:24:43
[ssh-keygen.c]
Add missing \n at end of error message.
Diffstat (limited to 'ssh-agent.1')
-rw-r--r-- | ssh-agent.1 | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ssh-agent.1 b/ssh-agent.1 index 31ea2b318..3ee5074b6 100644 --- a/ssh-agent.1 +++ b/ssh-agent.1 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: ssh-agent.1,v 1.17 2000/11/10 05:10:40 aaron Exp $ | 1 | .\" $OpenBSD: ssh-agent.1,v 1.19 2000/11/15 20:09:01 markus 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 |
@@ -42,12 +42,12 @@ | |||
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 | ||
46 | .Op Fl k | ||
47 | .Oo | ||
48 | .Ar command | 45 | .Ar command |
49 | .Op Ar args ... | 46 | .Ar args ... |
50 | .Oc | 47 | .Nm ssh-agent |
48 | .Op Fl c Li | Fl s | ||
49 | .Nm ssh-agent | ||
50 | .Fl k | ||
51 | .Sh DESCRIPTION | 51 | .Sh DESCRIPTION |
52 | .Nm | 52 | .Nm |
53 | is a program to hold private keys used for public key authentication | 53 | is a program to hold private keys used for public key authentication |
@@ -154,7 +154,7 @@ but is normally added to the agent using | |||
154 | at login time. | 154 | at login time. |
155 | .It Pa $HOME/.ssh/id_dsa | 155 | .It Pa $HOME/.ssh/id_dsa |
156 | Contains the DSA authentication identity of the user. | 156 | Contains the DSA authentication identity of the user. |
157 | .Pq Pa /tmp/ssh-XXXXXXXX/agent.<pid> , | 157 | .It Pa /tmp/ssh-XXXXXXXX/agent.<pid> |
158 | Unix-domain sockets used to contain the connection to the | 158 | Unix-domain sockets used to contain the connection to the |
159 | authentication agent. | 159 | authentication agent. |
160 | These sockets should only be readable by the owner. | 160 | These sockets should only be readable by the owner. |
@@ -172,7 +172,7 @@ This version of OpenSSH | |||
172 | .Bl -bullet | 172 | .Bl -bullet |
173 | .It | 173 | .It |
174 | has all components of a restrictive nature (i.e., patents, see | 174 | has all components of a restrictive nature (i.e., patents, see |
175 | .Xr crypto 3 ) | 175 | .Xr ssl 8 ) |
176 | directly removed from the source code; any licensed or patented components | 176 | directly removed from the source code; any licensed or patented components |
177 | are chosen from | 177 | are chosen from |
178 | external libraries. | 178 | external libraries. |
@@ -191,4 +191,4 @@ supports one-time password authentication with | |||
191 | .Xr ssh-add 1 , | 191 | .Xr ssh-add 1 , |
192 | .Xr ssh-keygen 1 , | 192 | .Xr ssh-keygen 1 , |
193 | .Xr sshd 8 , | 193 | .Xr sshd 8 , |
194 | .Xr crypto 3 | 194 | .Xr ssl 8 |