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 @@ -.\" $OpenBSD: ssh-agent.1,v 1.65 2019/10/31 21:22:01 djm Exp $ +.\" $OpenBSD: ssh-agent.1,v 1.66 2019/11/19 14:54:47 jmc Exp $ .\" .\" Author: Tatu Ylonen .\" Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -34,7 +34,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: October 31 2019 $ +.Dd $Mdocdate: November 19 2019 $ .Dt SSH-AGENT 1 .Os .Sh NAME @@ -43,15 +43,12 @@ .Sh SYNOPSIS .Nm ssh-agent .Op Fl c | s -.Op Fl \&Dd +.Op Fl Ddk .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 @@ -122,6 +119,7 @@ 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 41f96122b..841f3ce74 100644 --- a/ssh-agent.c +++ b/ssh-agent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-agent.c,v 1.248 2019/11/18 16:10:05 naddy Exp $ */ +/* $OpenBSD: ssh-agent.c,v 1.249 2019/11/19 14:54:47 jmc Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -1271,9 +1271,8 @@ static void usage(void) { fprintf(stderr, - "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"); + "usage: ssh-agent [-c | -s] [-Ddk] [-a bind_address] [-E fingerprint_hash]\n" + " [-P provider_whitelist] [-t life] [command [arg ...]]\n"); exit(1); }