src/usr.bin/ssh/ssh_config.5 - diff

Return to ssh_config.5 CVS log

Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/ssh_config.5 between version 1.168 and 1.169

-version 1.168, 2013/08/20 06:56:07
+version 1.169, 2013/10/14 22:22:05
 Line 100
 Line 100
 Line 100
  .It Cm Host
  Restricts the following declarations (up to the next
  .Cm Host
+ or
+ .Cm Match
  keyword) to be only for those hosts that match one of the patterns
  given after the keyword.
  If more than one pattern is provided, they should be separated by whitespace.
-Line 124
+Line 126
 Line 124
 Line 126
  See
  .Sx PATTERNS
  for more information on patterns.
+ .It Cm Match
+ Restricts the following declarations (up to the next
+ .Cm Host
+ or
+ .Cm Match
+ keyword) to be used only when the conditions following the
+ .Cm Match
+ keyword are satisfied.
+ Match conditions are specified using one or more keyword/criteria pairs.
+ The available keywords are:
+ .Cm command ,
+ .Cm host ,
+ .Cm originalhost ,
+ .Cm user ,
+ and
+ .Cm localuser .
+ .Pp
+ The criteria for the
+ .Cm command
+ keyword is a path to a command that is executed.
+ If the command returns a zero exit status then the condition is considered true.
+ Commands containing whitespace characters must be quoted.
+ .Pp
+ The other keywords' criteria must be single entries or comma-separated
+ lists and may use the wildcard and negation operators described in the
+ .Sx PATTERNS
+ section.
+ The criteria for the
+ .Cm host
+ keyword are matched against the target hostname, after any substitution
+ by the
+ .Cm Hostname
+ option.
+ The
+ .Cm originalhost
+ keyword matches against the hostname as it was specified on the command-line.
+ The
+ .Cm user
+ keyword matches against the target username on the remote host.
+ The
+ .Cm localuser
+ keyword matches against the name of the local user running
+ .Xr ssh 1
+ (this keyword may be useful in system-wide
+ .Nm
+ files).
  .It Cm AddressFamily
  Specifies which address family to use when connecting.
  Valid arguments are