diff options
author | jmc@openbsd.org <jmc@openbsd.org> | 2015-04-24 06:26:49 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-04-29 18:15:38 +1000 |
commit | b7ca276fca316c952f0b90f5adb1448c8481eedc (patch) | |
tree | 7dfe2747978d25a59a28ed77ad82adc63b835820 | |
parent | 2ea974630d7017e4c7666d14d9dc939707613e96 (diff) | |
download | openssh-git-b7ca276fca316c952f0b90f5adb1448c8481eedc.tar.gz |
upstream commit
combine -Dd onto one line and update usage();
-rw-r--r-- | ssh-agent.1 | 5 | ||||
-rw-r--r-- | ssh-agent.c | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/ssh-agent.1 b/ssh-agent.1 index adfb51cc..d0aa712f 100644 --- a/ssh-agent.1 +++ b/ssh-agent.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ssh-agent.1,v 1.58 2015/04/24 05:26:44 djm Exp $ +.\" $OpenBSD: ssh-agent.1,v 1.59 2015/04/24 06:26:49 jmc Exp $ .\" .\" Author: Tatu Ylonen <ylo@cs.hut.fi> .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -43,8 +43,7 @@ .Sh SYNOPSIS .Nm ssh-agent .Op Fl c | s -.Op Fl D -.Op Fl d +.Op Fl Dd .Op Fl a Ar bind_address .Op Fl E Ar fingerprint_hash .Op Fl t Ar life diff --git a/ssh-agent.c b/ssh-agent.c index 5356e116..c75575f6 100644 --- a/ssh-agent.c +++ b/ssh-agent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-agent.c,v 1.201 2015/04/24 05:26:44 djm Exp $ */ +/* $OpenBSD: ssh-agent.c,v 1.202 2015/04/24 06:26:49 jmc Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1137,7 +1137,7 @@ static void usage(void) { fprintf(stderr, - "usage: ssh-agent [-c | -s] [-d] [-a bind_address] [-E fingerprint_hash]\n" + "usage: ssh-agent [-c | -s] [-Dd] [-a bind_address] [-E fingerprint_hash]\n" " [-t life] [command [arg ...]]\n" " ssh-agent [-c | -s] -k\n"); exit(1); |