[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.192 and 1.193

version 1.192, 2014/08/30 15:33:50 version 1.193, 2014/10/08 22:20:25
Line 65 
Line 65 
 .Dq Host  .Dq Host
 specifications, and that section is only applied for hosts that  specifications, and that section is only applied for hosts that
 match one of the patterns given in the specification.  match one of the patterns given in the specification.
 The matched host name is the one given on the command line.  The matched host name is usually the one given on the command line
   (see the
   .Cm CanonicalizeHostname
   option for exceptions.)
 .Pp  .Pp
 Since the first obtained value for each parameter is used, more  Since the first obtained value for each parameter is used, more
 host-specific declarations should be given near the beginning of the  host-specific declarations should be given near the beginning of the
Line 109 
Line 112 
 .Ql *  .Ql *
 as a pattern can be used to provide global  as a pattern can be used to provide global
 defaults for all hosts.  defaults for all hosts.
 The host is the  The host is usually the
 .Ar hostname  .Ar hostname
 argument given on the command line (i.e. the name is not converted to  argument given on the command line
 a canonicalized host name before matching).  (see the
   .Cm CanonicalizeHostname
   option for exceptions.)
 .Pp  .Pp
 A pattern entry may be negated by prefixing it with an exclamation mark  A pattern entry may be negated by prefixing it with an exclamation mark
 .Pq Sq !\& .  .Pq Sq !\& .
Line 134 
Line 139 
 keyword) to be used only when the conditions following the  keyword) to be used only when the conditions following the
 .Cm Match  .Cm Match
 keyword are satisfied.  keyword are satisfied.
 Match conditions are specified using one or more keyword/criteria pairs  Match conditions are specified using one or more critera
 or the single token  or the single token
 .Cm all  .Cm all
 which matches all criteria.  which always matches.
 The available keywords are:  The available criteria keywords are:
   .Cm canonical ,
 .Cm exec ,  .Cm exec ,
 .Cm host ,  .Cm host ,
 .Cm originalhost ,  .Cm originalhost ,
 .Cm user ,  .Cm user ,
 and  and
 .Cm localuser .  .Cm localuser .
   The
   .Cm all
   criteria must appear alone or immediately after
   .Cm canonical.
   Other criteria may be combined arbitrarily.
   All criteria but
   .Cm all
   and
   .Cm canonical
   require an argument.
   Criteria may be negated by prepending an exclamation mark
   .Pq Sq !\& .
 .Pp  .Pp
 The  The
   .Cm canonical
   keywork matches only when the configuration file is being re-parsed
   after hostname canonicalization (see the
   .Cm CanonicalizeHostname
   option.)
   This may be useful to specify conditions that work with canonical host
   names only.
   The
 .Cm exec  .Cm exec
 keyword executes the specified command under the user's shell.  keyword executes the specified command under the user's shell.
 If the command returns a zero exit status then the condition is considered true.  If the command returns a zero exit status then the condition is considered true.
Line 179 
Line 205 
 keyword are matched against the target hostname, after any substitution  keyword are matched against the target hostname, after any substitution
 by the  by the
 .Cm Hostname  .Cm Hostname
 option.  or
   .Cm CanonicalizeHostname
   options.
 The  The
 .Cm originalhost  .Cm originalhost
 keyword matches against the hostname as it was specified on the command-line.  keyword matches against the hostname as it was specified on the command-line.
Line 264 
Line 292 
 .Dq always ,  .Dq always ,
 then canonicalization is applied to proxied connections too.  then canonicalization is applied to proxied connections too.
 .Pp  .Pp
 If this option is enabled and canonicalisation results in the target hostname  If this option is enabled, then the configuration files are processed
 changing, then the configuration files are processed again using the new  again using the new target name to pick up any new configuration in matching
 target name to pick up any new configuration in matching  
 .Cm Host  .Cm Host
   and
   .Cm Match
 stanzas.  stanzas.
 .It Cm CanonicalizeMaxDots  .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

Legend:
Removed from v.1.192  
changed lines
  Added in v.1.193