diff options
| author | jmc@openbsd.org <jmc@openbsd.org> | 2016-11-30 07:54:26 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2016-11-30 09:44:25 +0100 |
| commit | 5d333131cd8519d022389cfd3236280818dae1bc (patch) | |
| tree | ea2197dc230603483fa02eec0f205f0fde2bdf7b | |
| parent | upstream commit (diff) | |
| download | openssh-5d333131cd8519d022389cfd3236280818dae1bc.tar.xz openssh-5d333131cd8519d022389cfd3236280818dae1bc.zip | |
upstream commit
tweak previous; while here fix up FILES and AUTHORS;
Upstream-ID: 93f6e54086145a75df8d8ec7d8689bdadbbac8fa
| -rw-r--r-- | ssh-agent.1 | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/ssh-agent.1 b/ssh-agent.1 index 372adbe7c..83b2b41c8 100644 --- a/ssh-agent.1 +++ b/ssh-agent.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ssh-agent.1,v 1.63 2016/11/30 03:07:37 djm Exp $ +.\" $OpenBSD: ssh-agent.1,v 1.64 2016/11/30 06:54:26 jmc Exp $ .\" .\" Author: Tatu Ylonen <ylo@cs.hut.fi> .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -46,8 +46,8 @@ .Op Fl \&Dd .Op Fl a Ar bind_address .Op Fl E Ar fingerprint_hash -.Op Fl t Ar life .Op Fl P Ar pkcs11_whitelist +.Op Fl t Ar life .Op Ar command Op Ar arg ... .Nm ssh-agent .Op Fl c | s @@ -122,7 +122,7 @@ The default is Kill the current agent (given by the .Ev SSH_AGENT_PID environment variable). -.It Fl P +.It Fl P Ar pkcs11_whitelist Specify a pattern-list of acceptable paths for PKCS#11 shared libraries that may be added using the .Fl s @@ -208,7 +208,7 @@ The agent exits automatically when the command given on the command line terminates. .Sh FILES .Bl -tag -width Ds -.It Pa $TMPDIR/ssh-XXXXXXXXXX/agent.\*(Ltppid\*(Gt +.It Pa $TMPDIR/ssh-XXXXXXXXXX/agent.<ppid> .Ux Ns -domain sockets used to contain the connection to the authentication agent. These sockets should only be readable by the owner. @@ -220,11 +220,12 @@ The sockets should get automatically removed when the agent exits. .Xr ssh-keygen 1 , .Xr sshd 8 .Sh AUTHORS -OpenSSH is a derivative of the original and free -ssh 1.2.12 release by Tatu Ylonen. -Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos, -Theo de Raadt and Dug Song -removed many bugs, re-added newer features and -created OpenSSH. -Markus Friedl contributed the support for SSH -protocol versions 1.5 and 2.0. +.An -nosplit +OpenSSH is a derivative of the original and free ssh 1.2.12 release by +.An Tatu Ylonen . +.An Aaron Campbell , Bob Beck , Markus Friedl , Niels Provos , Theo de Raadt +and +.An Dug Song +removed many bugs, re-added newer features and created OpenSSH. +.An Markus Friedl +contributed the support for SSH protocol versions 1.5 and 2.0. |