summaryrefslogtreecommitdiff
path: root/ssh-agent.c
diff options
context:
space:
mode:
authorjmc@openbsd.org <jmc@openbsd.org>2019-11-19 14:54:47 +0000
committerDamien Miller <djm@mindrot.org>2019-11-20 09:27:29 +1100
commit88056f881315233e990e4e04a815f8f96b4674e1 (patch)
treeceffde55b084379fc7f80dbb7901f63474781446 /ssh-agent.c
parent2cf262c21f35296c2ff718cfdb52e0473a1c3983 (diff)
downloadopenssh-git-88056f881315233e990e4e04a815f8f96b4674e1.tar.gz
upstream: -c and -s do not make sense with -k; reshuffle -k into
the main synopsis/usage; ok djm OpenBSD-Commit-ID: f881ba253da015398ae8758d973e3390754869bc
Diffstat (limited to 'ssh-agent.c')
-rw-r--r--ssh-agent.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/ssh-agent.c b/ssh-agent.c
index 41f96122..841f3ce7 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 <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, 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);
}