diff options
author | jmc@openbsd.org <jmc@openbsd.org> | 2019-11-19 14:54:47 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-11-20 09:27:29 +1100 |
commit | 88056f881315233e990e4e04a815f8f96b4674e1 (patch) | |
tree | ceffde55b084379fc7f80dbb7901f63474781446 | |
parent | 2cf262c21f35296c2ff718cfdb52e0473a1c3983 (diff) |
upstream: -c and -s do not make sense with -k; reshuffle -k into
the main synopsis/usage; ok djm
OpenBSD-Commit-ID: f881ba253da015398ae8758d973e3390754869bc
-rw-r--r-- | ssh-agent.1 | 10 | ||||
-rw-r--r-- | ssh-agent.c | 7 |
2 files changed, 7 insertions, 10 deletions
diff --git a/ssh-agent.1 b/ssh-agent.1 index 7719384fe..b64868acc 100644 --- a/ssh-agent.1 +++ b/ssh-agent.1 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: ssh-agent.1,v 1.65 2019/10/31 21:22:01 djm Exp $ | 1 | .\" $OpenBSD: ssh-agent.1,v 1.66 2019/11/19 14:54:47 jmc 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: October 31 2019 $ | 37 | .Dd $Mdocdate: November 19 2019 $ |
38 | .Dt SSH-AGENT 1 | 38 | .Dt SSH-AGENT 1 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -43,15 +43,12 @@ | |||
43 | .Sh SYNOPSIS | 43 | .Sh SYNOPSIS |
44 | .Nm ssh-agent | 44 | .Nm ssh-agent |
45 | .Op Fl c | s | 45 | .Op Fl c | s |
46 | .Op Fl \&Dd | 46 | .Op Fl Ddk |
47 | .Op Fl a Ar bind_address | 47 | .Op Fl a Ar bind_address |
48 | .Op Fl E Ar fingerprint_hash | 48 | .Op Fl E Ar fingerprint_hash |
49 | .Op Fl P Ar provider_whitelist | 49 | .Op Fl P Ar provider_whitelist |
50 | .Op Fl t Ar life | 50 | .Op Fl t Ar life |
51 | .Op Ar command Op Ar arg ... | 51 | .Op Ar command Op Ar arg ... |
52 | .Nm ssh-agent | ||
53 | .Op Fl c | s | ||
54 | .Fl k | ||
55 | .Sh DESCRIPTION | 52 | .Sh DESCRIPTION |
56 | .Nm | 53 | .Nm |
57 | is a program to hold private keys used for public key authentication | 54 | is a program to hold private keys used for public key authentication |
@@ -122,6 +119,7 @@ The default is | |||
122 | Kill the current agent (given by the | 119 | Kill the current agent (given by the |
123 | .Ev SSH_AGENT_PID | 120 | .Ev SSH_AGENT_PID |
124 | environment variable). | 121 | environment variable). |
122 | This option should not be used with any other options. | ||
125 | .It Fl P Ar provider_whitelist | 123 | .It Fl P Ar provider_whitelist |
126 | Specify a pattern-list of acceptable paths for PKCS#11 and security key shared | 124 | Specify a pattern-list of acceptable paths for PKCS#11 and security key shared |
127 | libraries that may be used with the | 125 | libraries that may be used with the |
diff --git a/ssh-agent.c b/ssh-agent.c index 41f96122b..841f3ce74 100644 --- a/ssh-agent.c +++ b/ssh-agent.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-agent.c,v 1.248 2019/11/18 16:10:05 naddy Exp $ */ | 1 | /* $OpenBSD: ssh-agent.c,v 1.249 2019/11/19 14:54:47 jmc 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 |
@@ -1271,9 +1271,8 @@ static void | |||
1271 | usage(void) | 1271 | usage(void) |
1272 | { | 1272 | { |
1273 | fprintf(stderr, | 1273 | fprintf(stderr, |
1274 | "usage: ssh-agent [-c | -s] [-Dd] [-a bind_address] [-E fingerprint_hash]\n" | 1274 | "usage: ssh-agent [-c | -s] [-Ddk] [-a bind_address] [-E fingerprint_hash]\n" |
1275 | " [-P provider_whitelist] [-t life] [command [arg ...]]\n" | 1275 | " [-P provider_whitelist] [-t life] [command [arg ...]]\n"); |
1276 | " ssh-agent [-c | -s] -k\n"); | ||
1277 | exit(1); | 1276 | exit(1); |
1278 | } | 1277 | } |
1279 | 1278 | ||