diff options
author | jmc@openbsd.org <jmc@openbsd.org> | 2019-11-19 17:02:32 +0100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-11-19 23:27:29 +0100 |
commit | 4402d6c9b5bf128dcfae2429f1d41cdaa8849b6b (patch) | |
tree | dd5fdcac399a439b982cb9ea9a20ea011fb6dba1 /ssh-agent.1 | |
parent | upstream: -c and -s do not make sense with -k; reshuffle -k into (diff) | |
download | openssh-4402d6c9b5bf128dcfae2429f1d41cdaa8849b6b.tar.xz openssh-4402d6c9b5bf128dcfae2429f1d41cdaa8849b6b.zip |
upstream: revert previous: naddy pointed out what's meant to
happen. rethink needed...
OpenBSD-Commit-ID: fb0fede8123ea7f725fd65e00d49241c40bd3421
Diffstat (limited to 'ssh-agent.1')
-rw-r--r-- | ssh-agent.1 | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ssh-agent.1 b/ssh-agent.1 index b64868acc..9129d36ff 100644 --- a/ssh-agent.1 +++ b/ssh-agent.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ssh-agent.1,v 1.66 2019/11/19 14:54:47 jmc Exp $ +.\" $OpenBSD: ssh-agent.1,v 1.67 2019/11/19 16:02:32 jmc Exp $ .\" .\" Author: Tatu Ylonen <ylo@cs.hut.fi> .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -43,12 +43,15 @@ .Sh SYNOPSIS .Nm ssh-agent .Op Fl c | s -.Op Fl Ddk +.Op Fl \&Dd .Op Fl a Ar bind_address .Op Fl E Ar fingerprint_hash .Op Fl P Ar provider_whitelist .Op Fl t Ar life .Op Ar command Op Ar arg ... +.Nm ssh-agent +.Op Fl c | s +.Fl k .Sh DESCRIPTION .Nm is a program to hold private keys used for public key authentication @@ -119,7 +122,6 @@ The default is Kill the current agent (given by the .Ev SSH_AGENT_PID environment variable). -This option should not be used with any other options. .It Fl P Ar provider_whitelist Specify a pattern-list of acceptable paths for PKCS#11 and security key shared libraries that may be used with the |