diff options
author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:32:03 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:32:03 +0000 |
commit | 04942aa41fa94ec6f2c3ce1d348f600f31bb7c78 (patch) | |
tree | af8e928bd79d3f2d0219bb5b2c78b573ec31d94c /sshd_config.0 | |
parent | 9ad7b718d42e43f3a285fcbc8f91193931fce324 (diff) | |
parent | 16704d57999d987fb8d9ba53379841a79f016d67 (diff) |
import openssh-4.2p1-gsskex-20050926-2.patch
Diffstat (limited to 'sshd_config.0')
-rw-r--r-- | sshd_config.0 | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/sshd_config.0 b/sshd_config.0 index 1f8763faf..d821a84b6 100644 --- a/sshd_config.0 +++ b/sshd_config.0 | |||
@@ -83,18 +83,13 @@ DESCRIPTION | |||
83 | Specifies the ciphers allowed for protocol version 2. Multiple | 83 | Specifies the ciphers allowed for protocol version 2. Multiple |
84 | ciphers must be comma-separated. The supported ciphers are | 84 | ciphers must be comma-separated. The supported ciphers are |
85 | ``3des-cbc'', ``aes128-cbc'', ``aes192-cbc'', ``aes256-cbc'', | 85 | ``3des-cbc'', ``aes128-cbc'', ``aes192-cbc'', ``aes256-cbc'', |
86 | ``aes128-ctr'', ``aes192-ctr'', ``aes256-ctr'', ``arcfour'', | 86 | ``aes128-ctr'', ``aes192-ctr'', ``aes256-ctr'', ``arcfour128'', |
87 | ``blowfish-cbc'', and ``cast128-cbc''. The default is | 87 | ``arcfour256'', ``arcfour'', ``blowfish-cbc'', and |
88 | ``cast128-cbc''. The default is | ||
88 | 89 | ||
89 | ``aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour, | 90 | ``aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour128, |
90 | aes192-cbc,aes256-cbc,aes128-ctr,aes192-ctr,aes256-ctr'' | 91 | arcfour256,arcfour,aes192-cbc,aes256-cbc,aes128-ctr, |
91 | 92 | aes192-ctr,aes256-ctr'' | |
92 | ClientAliveInterval | ||
93 | Sets a timeout interval in seconds after which if no data has | ||
94 | been received from the client, sshd will send a message through | ||
95 | the encrypted channel to request a response from the client. The | ||
96 | default is 0, indicating that these messages will not be sent to | ||
97 | the client. This option applies to protocol version 2 only. | ||
98 | 93 | ||
99 | ClientAliveCountMax | 94 | ClientAliveCountMax |
100 | Sets the number of client alive messages (see above) which may be | 95 | Sets the number of client alive messages (see above) which may be |
@@ -113,9 +108,17 @@ DESCRIPTION | |||
113 | 15, and ClientAliveCountMax is left at the default, unresponsive | 108 | 15, and ClientAliveCountMax is left at the default, unresponsive |
114 | ssh clients will be disconnected after approximately 45 seconds. | 109 | ssh clients will be disconnected after approximately 45 seconds. |
115 | 110 | ||
111 | ClientAliveInterval | ||
112 | Sets a timeout interval in seconds after which if no data has | ||
113 | been received from the client, sshd will send a message through | ||
114 | the encrypted channel to request a response from the client. The | ||
115 | default is 0, indicating that these messages will not be sent to | ||
116 | the client. This option applies to protocol version 2 only. | ||
117 | |||
116 | Compression | 118 | Compression |
117 | Specifies whether compression is allowed. The argument must be | 119 | Specifies whether compression is allowed, or delayed until the |
118 | ``yes'' or ``no''. The default is ``yes''. | 120 | user has authenticated successfully. The argument must be |
121 | ``yes'', ``delayed'', or ``no''. The default is ``delayed''. | ||
119 | 122 | ||
120 | DenyGroups | 123 | DenyGroups |
121 | This keyword can be followed by a list of group name patterns, | 124 | This keyword can be followed by a list of group name patterns, |
@@ -183,7 +186,7 @@ DESCRIPTION | |||
183 | 186 | ||
184 | IgnoreUserKnownHosts | 187 | IgnoreUserKnownHosts |
185 | Specifies whether sshd should ignore the user's | 188 | Specifies whether sshd should ignore the user's |
186 | $HOME/.ssh/known_hosts during RhostsRSAAuthentication or | 189 | ~/.ssh/known_hosts during RhostsRSAAuthentication or |
187 | HostbasedAuthentication. The default is ``no''. | 190 | HostbasedAuthentication. The default is ``no''. |
188 | 191 | ||
189 | KerberosAuthentication | 192 | KerberosAuthentication |
@@ -383,7 +386,7 @@ DESCRIPTION | |||
383 | To disable TCP keepalive messages, the value should be set to | 386 | To disable TCP keepalive messages, the value should be set to |
384 | ``no''. | 387 | ``no''. |
385 | 388 | ||
386 | UseDNS Specifies whether sshd should lookup the remote host name and | 389 | UseDNS Specifies whether sshd should look up the remote host name and |
387 | check that the resolved host name for the remote IP address maps | 390 | check that the resolved host name for the remote IP address maps |
388 | back to the very same IP address. The default is ``yes''. | 391 | back to the very same IP address. The default is ``yes''. |
389 | 392 | ||
@@ -498,4 +501,4 @@ AUTHORS | |||
498 | versions 1.5 and 2.0. Niels Provos and Markus Friedl contributed support | 501 | versions 1.5 and 2.0. Niels Provos and Markus Friedl contributed support |
499 | for privilege separation. | 502 | for privilege separation. |
500 | 503 | ||
501 | OpenBSD 3.6 September 25, 1999 8 | 504 | OpenBSD 3.8 September 25, 1999 8 |