diff options
-rw-r--r-- | ssh-agent.1 | 8 | ||||
-rw-r--r-- | ssh-agent.c | 7 |
2 files changed, 9 insertions, 6 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 @@ | |||
1 | .\" $OpenBSD: ssh-agent.1,v 1.66 2019/11/19 14:54:47 jmc Exp $ | 1 | .\" $OpenBSD: ssh-agent.1,v 1.67 2019/11/19 16:02:32 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 |
@@ -43,12 +43,15 @@ | |||
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 Ddk | 46 | .Op Fl \&Dd |
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 | ||
52 | .Sh DESCRIPTION | 55 | .Sh DESCRIPTION |
53 | .Nm | 56 | .Nm |
54 | is a program to hold private keys used for public key authentication | 57 | is a program to hold private keys used for public key authentication |
@@ -119,7 +122,6 @@ The default is | |||
119 | Kill the current agent (given by the | 122 | Kill the current agent (given by the |
120 | .Ev SSH_AGENT_PID | 123 | .Ev SSH_AGENT_PID |
121 | environment variable). | 124 | environment variable). |
122 | This option should not be used with any other options. | ||
123 | .It Fl P Ar provider_whitelist | 125 | .It Fl P Ar provider_whitelist |
124 | Specify a pattern-list of acceptable paths for PKCS#11 and security key shared | 126 | Specify a pattern-list of acceptable paths for PKCS#11 and security key shared |
125 | libraries that may be used with the | 127 | libraries that may be used with the |
diff --git a/ssh-agent.c b/ssh-agent.c index 841f3ce74..1d4b779f6 100644 --- a/ssh-agent.c +++ b/ssh-agent.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-agent.c,v 1.249 2019/11/19 14:54:47 jmc Exp $ */ | 1 | /* $OpenBSD: ssh-agent.c,v 1.250 2019/11/19 16:02:32 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,8 +1271,9 @@ static void | |||
1271 | usage(void) | 1271 | usage(void) |
1272 | { | 1272 | { |
1273 | fprintf(stderr, | 1273 | fprintf(stderr, |
1274 | "usage: ssh-agent [-c | -s] [-Ddk] [-a bind_address] [-E fingerprint_hash]\n" | 1274 | "usage: ssh-agent [-c | -s] [-Dd] [-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"); | ||
1276 | exit(1); | 1277 | exit(1); |
1277 | } | 1278 | } |
1278 | 1279 | ||