diff options
author | jmc@openbsd.org <jmc@openbsd.org> | 2019-11-19 16:02:32 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-11-20 09:27:29 +1100 |
commit | 4402d6c9b5bf128dcfae2429f1d41cdaa8849b6b (patch) | |
tree | dd5fdcac399a439b982cb9ea9a20ea011fb6dba1 /ssh-agent.c | |
parent | 88056f881315233e990e4e04a815f8f96b4674e1 (diff) |
upstream: revert previous: naddy pointed out what's meant to
happen. rethink needed...
OpenBSD-Commit-ID: fb0fede8123ea7f725fd65e00d49241c40bd3421
Diffstat (limited to 'ssh-agent.c')
-rw-r--r-- | ssh-agent.c | 7 |
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 @@ | |||
1 | /* $OpenBSD: ssh-agent.c,v 1.249 2019/11/19 14:54:47 jmc Exp $ */ | 1 | /* $OpenBSD: ssh-agent.c,v 1.250 2019/11/19 16:02:32 jmc Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -1271,8 +1271,9 @@ static void | |||
1271 | usage(void) | 1271 | usage(void) |
1272 | { | 1272 | { |
1273 | fprintf(stderr, | 1273 | fprintf(stderr, |
1274 | "usage: ssh-agent [-c | -s] [-Ddk] [-a bind_address] [-E fingerprint_hash]\n" | 1274 | "usage: ssh-agent [-c | -s] [-Dd] [-a bind_address] [-E fingerprint_hash]\n" |
1275 | " [-P provider_whitelist] [-t life] [command [arg ...]]\n"); | 1275 | " [-P provider_whitelist] [-t life] [command [arg ...]]\n" |
1276 | " ssh-agent [-c | -s] -k\n"); | ||
1276 | exit(1); | 1277 | exit(1); |
1277 | } | 1278 | } |
1278 | 1279 | ||