summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2005-11-28 17:05:40 +1100
committerDarren Tucker <dtucker@zip.com.au>2005-11-28 17:05:40 +1100
commit3a4634f67415ae6c69b97f042b284b8d98955f97 (patch)
treed4dbfb5b9ca4163d12a03d0cd96c63a08ce028fb
parent9f647335d21daf0bf23257e47be98b3e18219b63 (diff)
- dtucker@cvs.openbsd.org 2005/11/28 06:02:56
[ssh-agent.1] Update agent socket path templates to reflect reality, correct xref for time formats. bz#1121, patch from openssh at roumenpetrov.info, ok djm@
-rw-r--r--ChangeLog6
-rw-r--r--ssh-agent.18
2 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 97be30611..211e34634 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,10 @@
8 increase minumum RSA key size to 768 bits and update man page to reflect 8 increase minumum RSA key size to 768 bits and update man page to reflect
9 these. Patch originally bz#1119 (senthilkumar_sen at hotpop.com), 9 these. Patch originally bz#1119 (senthilkumar_sen at hotpop.com),
10 ok djm@, grudging ok deraadt@. 10 ok djm@, grudging ok deraadt@.
11 - dtucker@cvs.openbsd.org 2005/11/28 06:02:56
12 [ssh-agent.1]
13 Update agent socket path templates to reflect reality, correct xref for
14 time formats. bz#1121, patch from openssh at roumenpetrov.info, ok djm@
11 15
1220051126 1620051126
13 - (dtucker) [configure.ac] Bug #1126: AIX 5.2 and 5.3 (and presumably newer, 17 - (dtucker) [configure.ac] Bug #1126: AIX 5.2 and 5.3 (and presumably newer,
@@ -3369,4 +3373,4 @@
3369 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3373 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3370 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3374 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3371 3375
3372$Id: ChangeLog,v 1.4010 2005/11/28 05:41:46 dtucker Exp $ 3376$Id: ChangeLog,v 1.4011 2005/11/28 06:05:40 dtucker Exp $
diff --git a/ssh-agent.1 b/ssh-agent.1
index 741cf4bd1..fd6bd3f6c 100644
--- a/ssh-agent.1
+++ b/ssh-agent.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-agent.1,v 1.42 2005/04/21 06:17:50 djm Exp $ 1.\" $OpenBSD: ssh-agent.1,v 1.43 2005/11/28 06:02:56 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
@@ -70,7 +70,7 @@ The options are as follows:
70Bind the agent to the unix-domain socket 70Bind the agent to the unix-domain socket
71.Ar bind_address . 71.Ar bind_address .
72The default is 72The default is
73.Pa /tmp/ssh-XXXXXXXX/agent.<ppid> . 73.Pa /tmp/ssh-XXXXXXXXXX/agent.<ppid> .
74.It Fl c 74.It Fl c
75Generate C-shell commands on 75Generate C-shell commands on
76.Dv stdout . 76.Dv stdout .
@@ -90,7 +90,7 @@ environment variable).
90.It Fl t Ar life 90.It Fl t Ar life
91Set a default value for the maximum lifetime of identities added to the agent. 91Set a default value for the maximum lifetime of identities added to the agent.
92The lifetime may be specified in seconds or in a time format specified in 92The lifetime may be specified in seconds or in a time format specified in
93.Xr sshd 8 . 93.Xr sshd_config 5 .
94A lifetime specified for an identity with 94A lifetime specified for an identity with
95.Xr ssh-add 1 95.Xr ssh-add 1
96overrides this value. 96overrides this value.
@@ -185,7 +185,7 @@ Contains the protocol version 1 RSA authentication identity of the user.
185Contains the protocol version 2 DSA authentication identity of the user. 185Contains the protocol version 2 DSA authentication identity of the user.
186.It Pa ~/.ssh/id_rsa 186.It Pa ~/.ssh/id_rsa
187Contains the protocol version 2 RSA authentication identity of the user. 187Contains the protocol version 2 RSA authentication identity of the user.
188.It Pa /tmp/ssh-XXXXXXXX/agent.<ppid> 188.It Pa /tmp/ssh-XXXXXXXXXX/agent.<ppid>
189Unix-domain sockets used to contain the connection to the 189Unix-domain sockets used to contain the connection to the
190authentication agent. 190authentication agent.
191These sockets should only be readable by the owner. 191These sockets should only be readable by the owner.