diff options
author | Colin Watson <cjwatson@debian.org> | 2003-09-23 18:08:35 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2003-09-23 18:08:35 +0000 |
commit | d59fd3e421aa81b8e5e118f3f806081df2aca879 (patch) | |
tree | 356a4e607edc979c625bb33db63c656d771478bd /ssh-agent.0 | |
parent | 7505658c58e96b8d270f1928a0e1fa7f3e0c266b (diff) | |
parent | 45431c9b4677608680cd071768cbf156b316a7e8 (diff) |
Merge 3.7.1p2 to the trunk. I have absolutely no idea yet whether this will
work.
Diffstat (limited to 'ssh-agent.0')
-rw-r--r-- | ssh-agent.0 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ssh-agent.0 b/ssh-agent.0 index 48cc9b36e..990cbc29b 100644 --- a/ssh-agent.0 +++ b/ssh-agent.0 | |||
@@ -60,7 +60,7 @@ DESCRIPTION | |||
60 | can thus use the privileges given by the identities anywhere in the net- | 60 | can thus use the privileges given by the identities anywhere in the net- |
61 | work in a secure way. | 61 | work in a secure way. |
62 | 62 | ||
63 | There are two main ways to get an agent setup: Either the agent starts a | 63 | There are two main ways to get an agent set up: Either the agent starts a |
64 | new subcommand into which some environment variables are exported, or the | 64 | new subcommand into which some environment variables are exported, or the |
65 | agent prints the needed shell commands (either sh(1) or csh(1) syntax can | 65 | agent prints the needed shell commands (either sh(1) or csh(1) syntax can |
66 | be generated) which can be evalled in the calling shell. Later ssh(1) | 66 | be generated) which can be evalled in the calling shell. Later ssh(1) |
@@ -101,6 +101,9 @@ FILES | |||
101 | owner. The sockets should get automatically removed when the | 101 | owner. The sockets should get automatically removed when the |
102 | agent exits. | 102 | agent exits. |
103 | 103 | ||
104 | SEE ALSO | ||
105 | ssh(1), ssh-add(1), ssh-keygen(1), sshd(8) | ||
106 | |||
104 | AUTHORS | 107 | AUTHORS |
105 | OpenSSH is a derivative of the original and free ssh 1.2.12 release by | 108 | OpenSSH is a derivative of the original and free ssh 1.2.12 release by |
106 | Tatu Ylonen. Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos, Theo | 109 | Tatu Ylonen. Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos, Theo |
@@ -108,7 +111,4 @@ AUTHORS | |||
108 | ated OpenSSH. Markus Friedl contributed the support for SSH protocol | 111 | ated OpenSSH. Markus Friedl contributed the support for SSH protocol |
109 | versions 1.5 and 2.0. | 112 | versions 1.5 and 2.0. |
110 | 113 | ||
111 | SEE ALSO | ||
112 | ssh(1), ssh-add(1), ssh-keygen(1), sshd(8) | ||
113 | |||
114 | BSD September 25, 1999 BSD | 114 | BSD September 25, 1999 BSD |