diff options
author | Colin Watson <cjwatson@debian.org> | 2013-09-14 23:42:11 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-09-14 23:42:11 +0100 |
commit | 327155e6824b3ee13837bdde04e4eb47e147ff46 (patch) | |
tree | 8f8743122403c7a2e6ed919156711fb1520c657f /ssh_config.0 | |
parent | 0334ce32304e9ba2a10ee5ca49ca6e8ff3ba6cf4 (diff) | |
parent | 74e339b8f8936bc0d985e053a076d0c9b5e9ea51 (diff) |
* New upstream release (http://www.openssh.com/txt/release-6.3).
- sftp(1): add support for resuming partial downloads using the "reget"
command and on the sftp commandline or on the "get" commandline using
the "-a" (append) option (closes: #158590).
- ssh(1): add an "IgnoreUnknown" configuration option to selectively
suppress errors arising from unknown configuration directives (closes:
#436052).
- sftp(1): update progressmeter when data is acknowledged, not when it's
sent (partially addresses #708372).
- ssh(1): do not fatally exit when attempting to cleanup multiplexing-
created channels that are incompletely opened (closes: #651357).
Diffstat (limited to 'ssh_config.0')
-rw-r--r-- | ssh_config.0 | 37 |
1 files changed, 28 insertions, 9 deletions
diff --git a/ssh_config.0 b/ssh_config.0 index 164d11817..bd9e1ad51 100644 --- a/ssh_config.0 +++ b/ssh_config.0 | |||
@@ -369,9 +369,9 @@ DESCRIPTION | |||
369 | for protocol version 1, and ~/.ssh/id_dsa, ~/.ssh/id_ecdsa and | 369 | for protocol version 1, and ~/.ssh/id_dsa, ~/.ssh/id_ecdsa and |
370 | ~/.ssh/id_rsa for protocol version 2. Additionally, any | 370 | ~/.ssh/id_rsa for protocol version 2. Additionally, any |
371 | identities represented by the authentication agent will be used | 371 | identities represented by the authentication agent will be used |
372 | for authentication. ssh(1) will try to load certificate | 372 | for authentication unless IdentitiesOnly is set. ssh(1) will try |
373 | information from the filename obtained by appending -cert.pub to | 373 | to load certificate information from the filename obtained by |
374 | the path of a specified IdentityFile. | 374 | appending -cert.pub to the path of a specified IdentityFile. |
375 | 375 | ||
376 | The file name may use the tilde syntax to refer to a user's home | 376 | The file name may use the tilde syntax to refer to a user's home |
377 | directory or one of the following escape characters: `%d' (local | 377 | directory or one of the following escape characters: `%d' (local |
@@ -384,6 +384,18 @@ DESCRIPTION | |||
384 | of identities tried (this behaviour differs from that of other | 384 | of identities tried (this behaviour differs from that of other |
385 | configuration directives). | 385 | configuration directives). |
386 | 386 | ||
387 | IdentityFile may be used in conjunction with IdentitiesOnly to | ||
388 | select which identities in an agent are offered during | ||
389 | authentication. | ||
390 | |||
391 | IgnoreUnknown | ||
392 | Specifies a pattern-list of unknown options to be ignored if they | ||
393 | are encountered in configuration parsing. This may be used to | ||
394 | suppress errors if ssh_config contains options that are | ||
395 | unrecognised by ssh(1). It is recommended that IgnoreUnknown be | ||
396 | listed early in the configuration file as it will not be applied | ||
397 | to unknown options that appear before it. | ||
398 | |||
387 | IPQoS Specifies the IPv4 type-of-service or DSCP class for connections. | 399 | IPQoS Specifies the IPv4 type-of-service or DSCP class for connections. |
388 | Accepted values are ``af11'', ``af12'', ``af13'', ``af21'', | 400 | Accepted values are ``af11'', ``af12'', ``af13'', ``af21'', |
389 | ``af22'', ``af23'', ``af31'', ``af32'', ``af33'', ``af41'', | 401 | ``af22'', ``af23'', ``af31'', ``af32'', ``af33'', ``af41'', |
@@ -552,11 +564,18 @@ DESCRIPTION | |||
552 | 564 | ||
553 | RekeyLimit | 565 | RekeyLimit |
554 | Specifies the maximum amount of data that may be transmitted | 566 | Specifies the maximum amount of data that may be transmitted |
555 | before the session key is renegotiated. The argument is the | 567 | before the session key is renegotiated, optionally followed a |
556 | number of bytes, with an optional suffix of `K', `M', or `G' to | 568 | maximum amount of time that may pass before the session key is |
557 | indicate Kilobytes, Megabytes, or Gigabytes, respectively. The | 569 | renegotiated. The first argument is specified in bytes and may |
558 | default is between `1G' and `4G', depending on the cipher. This | 570 | have a suffix of `K', `M', or `G' to indicate Kilobytes, |
559 | option applies to protocol version 2 only. | 571 | Megabytes, or Gigabytes, respectively. The default is between |
572 | `1G' and `4G', depending on the cipher. The optional second | ||
573 | value is specified in seconds and may use any of the units | ||
574 | documented in the TIME FORMATS section of sshd_config(5). The | ||
575 | default value for RekeyLimit is ``default none'', which means | ||
576 | that rekeying is performed after the cipher's default amount of | ||
577 | data has been sent or received and no time based rekeying is | ||
578 | done. This option applies to protocol version 2 only. | ||
560 | 579 | ||
561 | RemoteForward | 580 | RemoteForward |
562 | Specifies that a TCP port on the remote machine be forwarded over | 581 | Specifies that a TCP port on the remote machine be forwarded over |
@@ -773,4 +792,4 @@ AUTHORS | |||
773 | created OpenSSH. Markus Friedl contributed the support for SSH protocol | 792 | created OpenSSH. Markus Friedl contributed the support for SSH protocol |
774 | versions 1.5 and 2.0. | 793 | versions 1.5 and 2.0. |
775 | 794 | ||
776 | OpenBSD 5.3 January 8, 2013 OpenBSD 5.3 | 795 | OpenBSD 5.4 June 27, 2013 OpenBSD 5.4 |