diff options
author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:42:53 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:42:53 +0000 |
commit | 87552344215a38d3a2b0d4d63dc151e05978bbe1 (patch) | |
tree | 9f4b96055e6ccaa915e8d59d9f2805e9e119371d /ssh-agent.0 | |
parent | a25ec0b132c44c9e341e08464ff830de06b81126 (diff) | |
parent | ef94e5613d37bcbf880f21ee6094e4b1c7683a4c (diff) |
import openssh-5.1p1-gsskex-cjwatson-20080722.patch
Diffstat (limited to 'ssh-agent.0')
-rw-r--r-- | ssh-agent.0 | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ssh-agent.0 b/ssh-agent.0 index 823456a26..90348a6b2 100644 --- a/ssh-agent.0 +++ b/ssh-agent.0 | |||
@@ -4,7 +4,7 @@ NAME | |||
4 | ssh-agent - authentication agent | 4 | ssh-agent - authentication agent |
5 | 5 | ||
6 | SYNOPSIS | 6 | SYNOPSIS |
7 | ssh-agent [-a bind_address] [-c | -s] [-t life] [-d] [command [args ...]] | 7 | ssh-agent [-c | -s] [-d] [-a bind_address] [-t life] [command [arg ...]] |
8 | ssh-agent [-c | -s] -k | 8 | ssh-agent [-c | -s] -k |
9 | 9 | ||
10 | DESCRIPTION | 10 | DESCRIPTION |
@@ -24,12 +24,15 @@ DESCRIPTION | |||
24 | -c Generate C-shell commands on stdout. This is the default if | 24 | -c Generate C-shell commands on stdout. This is the default if |
25 | SHELL looks like it's a csh style of shell. | 25 | SHELL looks like it's a csh style of shell. |
26 | 26 | ||
27 | -s Generate Bourne shell commands on stdout. This is the default if | 27 | -d Debug mode. When this option is specified ssh-agent will not |
28 | SHELL does not look like it's a csh style of shell. | 28 | fork. |
29 | 29 | ||
30 | -k Kill the current agent (given by the SSH_AGENT_PID environment | 30 | -k Kill the current agent (given by the SSH_AGENT_PID environment |
31 | variable). | 31 | variable). |
32 | 32 | ||
33 | -s Generate Bourne shell commands on stdout. This is the default if | ||
34 | SHELL does not look like it's a csh style of shell. | ||
35 | |||
33 | -t life | 36 | -t life |
34 | Set a default value for the maximum lifetime of identities added | 37 | Set a default value for the maximum lifetime of identities added |
35 | to the agent. The lifetime may be specified in seconds or in a | 38 | to the agent. The lifetime may be specified in seconds or in a |
@@ -37,9 +40,6 @@ DESCRIPTION | |||
37 | for an identity with ssh-add(1) overrides this value. Without | 40 | for an identity with ssh-add(1) overrides this value. Without |
38 | this option the default maximum lifetime is forever. | 41 | this option the default maximum lifetime is forever. |
39 | 42 | ||
40 | -d Debug mode. When this option is specified ssh-agent will not | ||
41 | fork. | ||
42 | |||
43 | If a commandline is given, this is executed as a subprocess of the agent. | 43 | If a commandline is given, this is executed as a subprocess of the agent. |
44 | When the command dies, so does the agent. | 44 | When the command dies, so does the agent. |
45 | 45 | ||
@@ -114,4 +114,4 @@ AUTHORS | |||
114 | ated OpenSSH. Markus Friedl contributed the support for SSH protocol | 114 | ated OpenSSH. Markus Friedl contributed the support for SSH protocol |
115 | versions 1.5 and 2.0. | 115 | versions 1.5 and 2.0. |
116 | 116 | ||
117 | OpenBSD 4.2 June 5, 2007 2 | 117 | OpenBSD 4.4 June 5, 2007 2 |