summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ssh-agent.111
-rw-r--r--ssh-agent.c6
2 files changed, 12 insertions, 5 deletions
diff --git a/ssh-agent.1 b/ssh-agent.1
index fff0db6bc..8e9295e9d 100644
--- a/ssh-agent.1
+++ b/ssh-agent.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-agent.1,v 1.70 2019/12/21 20:22:34 naddy Exp $ 1.\" $OpenBSD: ssh-agent.1,v 1.71 2020/06/19 07:21:42 dtucker 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
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.Dd $Mdocdate: December 21 2019 $ 37.Dd $Mdocdate: June 19 2020 $
38.Dt SSH-AGENT 1 38.Dt SSH-AGENT 1
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -48,7 +48,12 @@
48.Op Fl E Ar fingerprint_hash 48.Op Fl E Ar fingerprint_hash
49.Op Fl P Ar provider_whitelist 49.Op Fl P Ar provider_whitelist
50.Op Fl t Ar life 50.Op Fl t Ar life
51.Op Ar command Op Ar arg ... 51.Nm ssh-agent
52.Op Fl a Ar bind_address
53.Op Fl E Ar fingerprint_hash
54.Op Fl P Ar provider_whitelist
55.Op Fl t Ar life
56.Ar command Op Ar arg ...
52.Nm ssh-agent 57.Nm ssh-agent
53.Op Fl c | s 58.Op Fl c | s
54.Fl k 59.Fl k
diff --git a/ssh-agent.c b/ssh-agent.c
index effffffed..596c39582 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-agent.c,v 1.258 2020/05/26 01:26:58 djm Exp $ */ 1/* $OpenBSD: ssh-agent.c,v 1.259 2020/06/19 07:21:42 dtucker 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
@@ -1254,7 +1254,9 @@ usage(void)
1254{ 1254{
1255 fprintf(stderr, 1255 fprintf(stderr,
1256 "usage: ssh-agent [-c | -s] [-Dd] [-a bind_address] [-E fingerprint_hash]\n" 1256 "usage: ssh-agent [-c | -s] [-Dd] [-a bind_address] [-E fingerprint_hash]\n"
1257 " [-P provider_whitelist] [-t life] [command [arg ...]]\n" 1257 " [-P provider_whitelist] [-t life]\n"
1258 " ssh-agent [-a bind_address] [-E fingerprint_hash] [-P provider_whitelist]\n"
1259 " [-t life] command [arg ...]\n"
1258 " ssh-agent [-c | -s] -k\n"); 1260 " ssh-agent [-c | -s] -k\n");
1259 exit(1); 1261 exit(1);
1260} 1262}