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 b64868ac..9129d36f 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 diff --git a/ssh-agent.c b/ssh-agent.c index 841f3ce7..1d4b779f 100644 --- a/ssh-agent.c +++ b/ssh-agent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-agent.c,v 1.249 2019/11/19 14:54:47 jmc Exp $ */ +/* $OpenBSD: ssh-agent.c,v 1.250 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 @@ -1271,8 +1271,9 @@ static void usage(void) { fprintf(stderr, - "usage: ssh-agent [-c | -s] [-Ddk] [-a bind_address] [-E fingerprint_hash]\n" - " [-P provider_whitelist] [-t life] [command [arg ...]]\n"); + "usage: ssh-agent [-c | -s] [-Dd] [-a bind_address] [-E fingerprint_hash]\n" + " [-P provider_whitelist] [-t life] [command [arg ...]]\n" + " ssh-agent [-c | -s] -k\n"); exit(1); } |