diff options
author | Colin Watson <cjwatson@debian.org> | 2014-03-20 00:32:39 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2014-03-20 00:34:16 +0000 |
commit | 2ee2de47fd0f684f54218d31b4ec83930e69c18e (patch) | |
tree | 86848a7668424b392d48791a0e41e05f9df7b62b /ssh_config.0 | |
parent | c9947303ad3c432b1cadfbeb1d95a7cd38662d66 (diff) | |
parent | 9cbb60f5e4932634db04c330c88abc49cc5567bd (diff) |
Merge 6.6p1.
* New upstream release (http://www.openssh.com/txt/release-6.6).
Diffstat (limited to 'ssh_config.0')
-rw-r--r-- | ssh_config.0 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ssh_config.0 b/ssh_config.0 index e9ac54bfc..6fbd10d61 100644 --- a/ssh_config.0 +++ b/ssh_config.0 | |||
@@ -128,6 +128,11 @@ DESCRIPTION | |||
128 | set to ``always'', then canonicalization is applied to proxied | 128 | set to ``always'', then canonicalization is applied to proxied |
129 | connections too. | 129 | connections too. |
130 | 130 | ||
131 | If this option is enabled and canonicalisation results in the | ||
132 | target hostname changing, then the configuration files are | ||
133 | processed again using the new target name to pick up any new | ||
134 | configuration in matching Host stanzas. | ||
135 | |||
131 | CanonicalizeMaxDots | 136 | CanonicalizeMaxDots |
132 | Specifies the maximum number of dot characters in a hostname | 137 | Specifies the maximum number of dot characters in a hostname |
133 | before canonicalization is disabled. The default, ``1'', allows | 138 | before canonicalization is disabled. The default, ``1'', allows |
@@ -881,4 +886,4 @@ AUTHORS | |||
881 | created OpenSSH. Markus Friedl contributed the support for SSH protocol | 886 | created OpenSSH. Markus Friedl contributed the support for SSH protocol |
882 | versions 1.5 and 2.0. | 887 | versions 1.5 and 2.0. |
883 | 888 | ||
884 | OpenBSD 5.4 January 19, 2014 OpenBSD 5.4 | 889 | OpenBSD 5.5 February 23, 2014 OpenBSD 5.5 |