[BACK]Return to ssh_config.5 CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/ssh_config.5 between version 1.172 and 1.173

version 1.172, 2013/10/16 06:42:25 version 1.173, 2013/10/16 22:49:39
Line 202 
Line 202 
 .Dq yes .  .Dq yes .
 .It Cm CanonicalDomains  .It Cm CanonicalDomains
 When  When
 .Cm CanonicaliseHostname  .Cm CanonicalizeHostname
 is enabled, this option specifies the list of domain suffixes in which to  is enabled, this option specifies the list of domain suffixes in which to
 search for the specified destination host.  search for the specified destination host.
 .It Cm CanonicaliseFallbackLocal  .It Cm CanonicalizeFallbackLocal
 Specifies whether to fail with an error when hostname canonicalisation fails.  Specifies whether to fail with an error when hostname canonicalisation fails.
 The default,  The default,
 .Dq no ,  .Dq no ,
Line 216 
Line 216 
 will cause  will cause
 .Xr ssh 1  .Xr ssh 1
 to fail instantly if  to fail instantly if
 .Cm CanonicaliseHostname  .Cm CanonicalizeHostname
 is enabled and the target hostname cannot be found in any of the domains  is enabled and the target hostname cannot be found in any of the domains
 specified by  specified by
 .Cm CanonicalDomains .  .Cm CanonicalDomains .
 .It Cm CanonicaliseHostname  .It Cm CanonicalizeHostname
 Controls whether explicit hostname canonicalisation is performed.  Controls whether explicit hostname canonicalisation is performed.
 The default,  The default,
 .Dq no ,  .Dq no ,
Line 231 
Line 231 
 then, for connections that do not use a  then, for connections that do not use a
 .Cm ProxyCommand ,  .Cm ProxyCommand ,
 .Xr ssh 1  .Xr ssh 1
 will attempt to canonicalise the hostname specified on the command line  will attempt to canonicalize the hostname specified on the command line
 using the  using the
 .Cm CanonicalDomains  .Cm CanonicalDomains
 suffixes and  suffixes and
 .Cm CanonicalisePermittedCNAMEs  .Cm CanonicalizePermittedCNAMEs
 rules.  rules.
 If  If
 .Cm CanonicaliseHostname  .Cm CanonicalizeHostname
 is set to  is set to
 .Dq always ,  .Dq always ,
 then canonicalisation is applied to proxied connections too.  then canonicalisation is applied to proxied connections too.
 .It Cm CanonicaliseMaxDots  .It Cm CanonicalizeMaxDots
 Specifies the maximum number of dot characters in a hostname before  Specifies the maximum number of dot characters in a hostname before
 canonicalisation is disabled.  canonicalisation is disabled.
 The default,  The default,
 .Dq 1 ,  .Dq 1 ,
 allows a single dot (i.e. hostname.subdomain).  allows a single dot (i.e. hostname.subdomain).
 .It Cm CanonicalisePermittedCNAMEs  .It Cm CanonicalizePermittedCNAMEs
 Specifies rules to determine whether CNAMEs should be followed when  Specifies rules to determine whether CNAMEs should be followed when
 canonicalising hostnames.  canonicalizing hostnames.
 The rules consist of one or more arguments of  The rules consist of one or more arguments of
 .Ar source_domain_list : Ns Ar target_domain_list ,  .Ar source_domain_list : Ns Ar target_domain_list ,
 where  where
Line 264 
Line 264 
 .Dq *.a.example.com:*.b.example.com,*.c.example.com  .Dq *.a.example.com:*.b.example.com,*.c.example.com
 will allow hostnames matching  will allow hostnames matching
 .Dq *.a.example.com  .Dq *.a.example.com
 to be canonicalised to names in the  to be canonicalized to names in the
 .Dq *.b.example.com  .Dq *.b.example.com
 or  or
 .Dq *.c.example.com  .Dq *.c.example.com
Legend:
Removed from v.1.172  
changed lines
  Added in v.1.173