From 00531bb42f1af17ddabea59c3d9c4b0629000d27 Mon Sep 17 00:00:00 2001 From: "dtucker@openbsd.org" Date: Fri, 19 Jun 2020 07:21:42 +0000 Subject: upstream: Correct synopsis and usage for the options accepted when passing a command to ssh-agent. ok jmc@ OpenBSD-Commit-ID: b36f0679cb0cac0e33b361051b3406ade82ea846 --- ssh-agent.1 | 11 ++++++++--- ssh-agent.c | 6 ++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ssh-agent.1 b/ssh-agent.1 index fff0db6bc..8e9295e9d 100644 --- a/ssh-agent.1 +++ b/ssh-agent.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ssh-agent.1,v 1.70 2019/12/21 20:22:34 naddy Exp $ +.\" $OpenBSD: ssh-agent.1,v 1.71 2020/06/19 07:21:42 dtucker 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: December 21 2019 $ +.Dd $Mdocdate: June 19 2020 $ .Dt SSH-AGENT 1 .Os .Sh NAME @@ -48,7 +48,12 @@ .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 a Ar bind_address +.Op Fl E Ar fingerprint_hash +.Op Fl P Ar provider_whitelist +.Op Fl t Ar life +.Ar command Op Ar arg ... .Nm ssh-agent .Op Fl c | s .Fl k diff --git a/ssh-agent.c b/ssh-agent.c index effffffed..596c39582 100644 --- a/ssh-agent.c +++ b/ssh-agent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-agent.c,v 1.258 2020/05/26 01:26:58 djm Exp $ */ +/* $OpenBSD: ssh-agent.c,v 1.259 2020/06/19 07:21:42 dtucker Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -1254,7 +1254,9 @@ 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" + " [-P provider_whitelist] [-t life]\n" + " ssh-agent [-a bind_address] [-E fingerprint_hash] [-P provider_whitelist]\n" + " [-t life] command [arg ...]\n" " ssh-agent [-c | -s] -k\n"); exit(1); } -- cgit v1.2.3