summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-05-15 10:16:21 +1000
committerDamien Miller <djm@mindrot.org>2003-05-15 10:16:21 +1000
commitabbae980e7532da68e7f6aa1da716fb69e7521ad (patch)
tree854656166e47a5ef6792d132e2fa580e693f52a1
parent1ea7166019154c4e4c829ff5b170b778a5a4cab7 (diff)
- (djm) OpenBSD CVS Sync
- jmc@cvs.openbsd.org 2003/05/14 13:11:56 [ssh-agent.1] setup -> set up; from wiz@netbsd
-rw-r--r--ChangeLog9
-rw-r--r--ssh-agent.14
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 46d14e74d..8ad7108a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
120030515
2 - (djm) OpenBSD CVS Sync
3 - jmc@cvs.openbsd.org 2003/05/14 13:11:56
4 [ssh-agent.1]
5 setup -> set up;
6 from wiz@netbsd
7
120030514 820030514
2 - (djm) Bug #117: Don't lie to PAM about username 9 - (djm) Bug #117: Don't lie to PAM about username
3 - (djm) RCSID sync w/ OpenBSD 10 - (djm) RCSID sync w/ OpenBSD
@@ -1472,4 +1479,4 @@
1472 save auth method before monitor_reset_key_state(); bugzilla bug #284; 1479 save auth method before monitor_reset_key_state(); bugzilla bug #284;
1473 ok provos@ 1480 ok provos@
1474 1481
1475$Id: ChangeLog,v 1.2700 2003/05/14 12:33:58 djm Exp $ 1482$Id: ChangeLog,v 1.2701 2003/05/15 00:16:21 djm Exp $
diff --git a/ssh-agent.1 b/ssh-agent.1
index fde4608bb..eae6716b7 100644
--- a/ssh-agent.1
+++ b/ssh-agent.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-agent.1,v 1.37 2003/03/28 10:11:43 jmc Exp $ 1.\" $OpenBSD: ssh-agent.1,v 1.38 2003/05/14 13:11:56 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
@@ -133,7 +133,7 @@ However, the connection to the agent is forwarded over SSH
133remote logins, and the user can thus use the privileges given by the 133remote 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 setup: 136There are two main ways to get an agent set up:
137Either the agent starts a new subcommand into which some environment 137Either the agent starts a new subcommand into which some environment
138variables are exported, or the agent prints the needed shell commands 138variables are exported, or the agent prints the needed shell commands
139(either 139(either