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

Diff for /src/usr.bin/ssh/sshd_config.5 between version 1.148 and 1.149

version 1.148, 2012/11/04 10:38:43 version 1.149, 2012/11/04 11:09:15
Line 151 
Line 151 
 in  in
 .Xr ssh_config 5  .Xr ssh_config 5
 for more information on patterns.  for more information on patterns.
   .It Cm AuthenticationMethods
   Specifies the authentication methods that must be successfully completed
   for a user to be granted access.
   This option must be followed by one or more comma-separated lists of
   authentication method names.
   Successful authentication requires completion of every method in at least
   one of these lists.
   .Pp
   For example, an argument of
   .Dq publickey,password publickey,keyboard-interactive
   would require the user to complete public key authentication, followed by
   either password or keyboard interactive authentication.
   Only methods that are next in one or more lists are offered at each stage,
   so for this example, it would not be possible to attempt password or
   keyboard-interactive authentication before public key.
   .Pp
   This option is only available for SSH protocol 2 and will yield a fatal
   error if enabled if protocol 1 is also enabled.
   Note that each authentication method listed should also be explicitly enabled
   in the configuration.
   The default is not to require multiple authentication; successful completion
   of a single authentication method is sufficient.
 .It Cm AuthorizedKeysCommand  .It Cm AuthorizedKeysCommand
 Specifies a program to be used to look up the user's public keys.  Specifies a program to be used to look up the user's public keys.
 The program will be invoked with a single argument of the username  The program will be invoked with a single argument of the username
Line 729 
Line 751 
 .Cm AllowGroups ,  .Cm AllowGroups ,
 .Cm AllowTcpForwarding ,  .Cm AllowTcpForwarding ,
 .Cm AllowUsers ,  .Cm AllowUsers ,
   .Cm AuthenticationMethods ,
 .Cm AuthorizedKeysCommand ,  .Cm AuthorizedKeysCommand ,
 .Cm AuthorizedKeysCommandUser ,  .Cm AuthorizedKeysCommandUser ,
 .Cm AuthorizedKeysFile ,  .Cm AuthorizedKeysFile ,

Legend:
Removed from v.1.148  
changed lines
  Added in v.1.149