upstream: -c and -s do not make sense with -k; reshuffle -k into

the main synopsis/usage; ok djm

OpenBSD-Commit-ID: f881ba253da015398ae8758d973e3390754869bc

1 files changed, 3 insertions, 4 deletions

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 <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);
 }