diff options
Diffstat (limited to 'ssh_config.0')
-rw-r--r-- | ssh_config.0 | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/ssh_config.0 b/ssh_config.0 index 2ca4ee31b..381c1ba0a 100644 --- a/ssh_config.0 +++ b/ssh_config.0 | |||
@@ -200,9 +200,9 @@ DESCRIPTION | |||
200 | 200 | ||
201 | ExitOnForwardFailure | 201 | ExitOnForwardFailure |
202 | Specifies whether ssh(1) should terminate the connection if it | 202 | Specifies whether ssh(1) should terminate the connection if it |
203 | cannot set up all requested dynamic, local, and remote port for- | 203 | cannot set up all requested dynamic, tunnel, local, and remote |
204 | wardings. The argument must be ``yes'' or ``no''. The default | 204 | port forwardings. The argument must be ``yes'' or ``no''. The |
205 | is ``no''. | 205 | default is ``no''. |
206 | 206 | ||
207 | ForwardAgent | 207 | ForwardAgent |
208 | Specifies whether the connection to the authentication agent (if | 208 | Specifies whether the connection to the authentication agent (if |
@@ -365,8 +365,10 @@ DESCRIPTION | |||
365 | MACs Specifies the MAC (message authentication code) algorithms in or- | 365 | MACs Specifies the MAC (message authentication code) algorithms in or- |
366 | der of preference. The MAC algorithm is used in protocol version | 366 | der of preference. The MAC algorithm is used in protocol version |
367 | 2 for data integrity protection. Multiple algorithms must be | 367 | 2 for data integrity protection. Multiple algorithms must be |
368 | comma-separated. The default is: ``hmac-md5,hmac-sha1,hmac- | 368 | comma-separated. The default is: |
369 | ripemd160,hmac-sha1-96,hmac-md5-96''. | 369 | |
370 | hmac-md5,hmac-sha1,umac-64@openssh.com, | ||
371 | hmac-ripemd160,hmac-sha1-96,hmac-md5-96 | ||
370 | 372 | ||
371 | NoHostAuthenticationForLocalhost | 373 | NoHostAuthenticationForLocalhost |
372 | This option can be used if the home directory is shared across | 374 | This option can be used if the home directory is shared across |
@@ -642,4 +644,4 @@ AUTHORS | |||
642 | ated OpenSSH. Markus Friedl contributed the support for SSH protocol | 644 | ated OpenSSH. Markus Friedl contributed the support for SSH protocol |
643 | versions 1.5 and 2.0. | 645 | versions 1.5 and 2.0. |
644 | 646 | ||
645 | OpenBSD 4.1 September 25, 1999 10 | 647 | OpenBSD 4.2 August 15, 2007 10 |