summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2004-05-13 16:45:46 +1000
committerDarren Tucker <dtucker@zip.com.au>2004-05-13 16:45:46 +1000
commita86b453bb3282bac162693dc7366286c7334a91f (patch)
treea94ee02f9c295e112cefc98d8c54c0c3ae7174c8
parent1f8311c836a20ce4923e2142d206f8d8073d0ca4 (diff)
- dtucker@cvs.openbsd.org 2004/05/13 02:47:50
[ssh-agent.1] Add examples to ssh-agent.1, bz#481 from Ralf Hauser; ok deraadt@
-rw-r--r--ChangeLog5
-rw-r--r--ssh-agent.122
2 files changed, 21 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index fb81a8145..7ccb6f241 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,9 @@
31 [auth.c auth2-none.c authfile.c channels.c monitor.c monitor_mm.c 31 [auth.c auth2-none.c authfile.c channels.c monitor.c monitor_mm.c
32 packet.c packet.h progressmeter.c session.c openbsd-compat/xmmap.c] 32 packet.c packet.h progressmeter.c session.c openbsd-compat/xmmap.c]
33 improve some code lint did not like; djm millert ok 33 improve some code lint did not like; djm millert ok
34 - dtucker@cvs.openbsd.org 2004/05/13 02:47:50
35 [ssh-agent.1]
36 Add examples to ssh-agent.1, bz#481 from Ralf Hauser; ok deraadt@
34 37
3520040502 3820040502
36 - (dtucker) OpenBSD CVS Sync 39 - (dtucker) OpenBSD CVS Sync
@@ -1107,4 +1110,4 @@
1107 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1110 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1108 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1111 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1109 1112
1110$Id: ChangeLog,v 1.3350 2004/05/13 06:39:33 dtucker Exp $ 1113$Id: ChangeLog,v 1.3351 2004/05/13 06:45:46 dtucker Exp $
diff --git a/ssh-agent.1 b/ssh-agent.1
index aab15cc7f..cfefd34e9 100644
--- a/ssh-agent.1
+++ b/ssh-agent.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-agent.1,v 1.39 2003/06/10 09:12:11 jmc Exp $ 1.\" $OpenBSD: ssh-agent.1,v 1.40 2004/05/13 02:47:50 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
@@ -134,13 +134,25 @@ remote logins, and the user can thus use the privileges given by the
134identities anywhere in the network in a secure way. 134identities anywhere in the network in a secure way.
135.Pp 135.Pp
136There are two main ways to get an agent set up: 136There are two main ways to get an agent set up:
137Either the agent starts a new subcommand into which some environment 137The first is that the agent starts a new subcommand into which some environment
138variables are exported, or the agent prints the needed shell commands 138variables are exported, eg
139(either 139.Cm ssh-agent xterm & .
140The second is that the agent prints the needed shell commands (either
140.Xr sh 1 141.Xr sh 1
141or 142or
142.Xr csh 1 143.Xr csh 1
143syntax can be generated) which can be evalled in the calling shell. 144syntax can be generated) which can be evalled in the calling shell, eg
145.Cm eval `ssh-agent -s`
146for Bourne-type shells such as
147.Xr sh 1
148or
149.Xr ksh 1
150and
151.Cm eval `ssh-agent -c`
152for
153.Xr csh 1
154and derivatives.
155.Pp
144Later 156Later
145.Xr ssh 1 157.Xr ssh 1
146looks at these variables and uses them to establish a connection to the agent. 158looks at these variables and uses them to establish a connection to the agent.