diff options
author | Colin Watson <cjwatson@debian.org> | 2010-01-01 17:15:23 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-01-01 17:15:23 +0000 |
commit | 99b402ea4c8457b0a3cafff37f5b3410a8dc6476 (patch) | |
tree | 1d24ce54c9981ea8cbb4c5a9309964a0e4c4b320 /ssh_config.0 | |
parent | 87552344215a38d3a2b0d4d63dc151e05978bbe1 (diff) | |
parent | 54af7a4ae8d455791a631bdfaade4b64436ae16a (diff) |
import openssh-5.2p1-gsskex-all-20090726.patch
Diffstat (limited to 'ssh_config.0')
-rw-r--r-- | ssh_config.0 | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/ssh_config.0 b/ssh_config.0 index e2e645854..e5ded8e31 100644 --- a/ssh_config.0 +++ b/ssh_config.0 | |||
@@ -41,7 +41,7 @@ DESCRIPTION | |||
41 | Host Restricts the following declarations (up to the next Host key- | 41 | Host Restricts the following declarations (up to the next Host key- |
42 | word) to be only for those hosts that match one of the patterns | 42 | word) to be only for those hosts that match one of the patterns |
43 | given after the keyword. If more than one pattern is provided, | 43 | given after the keyword. If more than one pattern is provided, |
44 | they should be separated by whitepsace. A single `*' as a pat- | 44 | they should be separated by whitespace. A single `*' as a pat- |
45 | tern can be used to provide global defaults for all hosts. The | 45 | tern can be used to provide global defaults for all hosts. The |
46 | host is the hostname argument given on the command line (i.e. the | 46 | host is the hostname argument given on the command line (i.e. the |
47 | name is not converted to a canonicalized host name before match- | 47 | name is not converted to a canonicalized host name before match- |
@@ -93,9 +93,9 @@ DESCRIPTION | |||
93 | ``arcfour128'', ``arcfour256'', ``arcfour'', ``blowfish-cbc'', | 93 | ``arcfour128'', ``arcfour256'', ``arcfour'', ``blowfish-cbc'', |
94 | and ``cast128-cbc''. The default is: | 94 | and ``cast128-cbc''. The default is: |
95 | 95 | ||
96 | aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour128, | 96 | aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128, |
97 | arcfour256,arcfour,aes192-cbc,aes256-cbc,aes128-ctr, | 97 | aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,aes192-cbc, |
98 | aes192-ctr,aes256-ctr | 98 | aes256-cbc,arcfour |
99 | 99 | ||
100 | ClearAllForwardings | 100 | ClearAllForwardings |
101 | Specifies that all local, remote, and dynamic port forwardings | 101 | Specifies that all local, remote, and dynamic port forwardings |
@@ -463,8 +463,11 @@ DESCRIPTION | |||
463 | specified by enclosing addresses in square brackets or by using | 463 | specified by enclosing addresses in square brackets or by using |
464 | an alternative syntax: [bind_address/]port and host/hostport. | 464 | an alternative syntax: [bind_address/]port and host/hostport. |
465 | Multiple forwardings may be specified, and additional forwardings | 465 | Multiple forwardings may be specified, and additional forwardings |
466 | can be given on the command line. Only the superuser can forward | 466 | can be given on the command line. Privileged ports can be for- |
467 | privileged ports. | 467 | warded only when logging in as root on the remote machine. |
468 | |||
469 | If the port argument is `0', the listen port will be dynamically | ||
470 | allocated on the server and reported to the client at run time. | ||
468 | 471 | ||
469 | If the bind_address is not specified, the default is to only bind | 472 | If the bind_address is not specified, the default is to only bind |
470 | to loopback addresses. If the bind_address is `*' or an empty | 473 | to loopback addresses. If the bind_address is `*' or an empty |
@@ -609,9 +612,11 @@ DESCRIPTION | |||
609 | 612 | ||
610 | VisualHostKey | 613 | VisualHostKey |
611 | If this flag is set to ``yes'', an ASCII art representation of | 614 | If this flag is set to ``yes'', an ASCII art representation of |
612 | the remote host key fingerprint is printed additionally to the | 615 | the remote host key fingerprint is printed in addition to the hex |
613 | hex fingerprint string. If this flag is set to ``no'', only the | 616 | fingerprint string at login and for unknown host keys. If this |
614 | hex fingerprint string will be printed. The default is ``no''. | 617 | flag is set to ``no'', no fingerprint strings are printed at lo- |
618 | gin and only the hex fingerprint string will be printed for un- | ||
619 | known host keys. The default is ``no''. | ||
615 | 620 | ||
616 | XAuthLocation | 621 | XAuthLocation |
617 | Specifies the full pathname of the xauth(1) program. The default | 622 | Specifies the full pathname of the xauth(1) program. The default |
@@ -662,4 +667,4 @@ AUTHORS | |||
662 | ated OpenSSH. Markus Friedl contributed the support for SSH protocol | 667 | ated OpenSSH. Markus Friedl contributed the support for SSH protocol |
663 | versions 1.5 and 2.0. | 668 | versions 1.5 and 2.0. |
664 | 669 | ||
665 | OpenBSD 4.4 June 26, 2008 11 | 670 | OpenBSD 4.5 February 22, 2009 11 |