summaryrefslogtreecommitdiffstats
path: root/ssh-agent.c
diff options
context:
space:
mode:
authorjmc@openbsd.org <jmc@openbsd.org>2019-11-19 17:02:32 +0100
committerDamien Miller <djm@mindrot.org>2019-11-19 23:27:29 +0100
commit4402d6c9b5bf128dcfae2429f1d41cdaa8849b6b (patch)
treedd5fdcac399a439b982cb9ea9a20ea011fb6dba1 /ssh-agent.c
parentupstream: -c and -s do not make sense with -k; reshuffle -k into (diff)
downloadopenssh-4402d6c9b5bf128dcfae2429f1d41cdaa8849b6b.tar.xz
openssh-4402d6c9b5bf128dcfae2429f1d41cdaa8849b6b.zip
upstream: revert previous: naddy pointed out what's meant to
happen. rethink needed... OpenBSD-Commit-ID: fb0fede8123ea7f725fd65e00d49241c40bd3421
Diffstat (limited to '')
-rw-r--r--ssh-agent.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/ssh-agent.c b/ssh-agent.c
index 841f3ce74..1d4b779f6 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);
}