[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.225 and 1.226

version 1.225, 2016/02/16 05:11:04 version 1.226, 2016/02/17 07:38:19
Line 824 
Line 824 
 Specifies whether user authentication based on GSSAPI is allowed.  Specifies whether user authentication based on GSSAPI is allowed.
 The default is  The default is
 .Dq no .  .Dq no .
 Note that this option applies to protocol version 2 only.  
 .It Cm GSSAPIDelegateCredentials  .It Cm GSSAPIDelegateCredentials
 Forward (delegate) credentials to the server.  Forward (delegate) credentials to the server.
 The default is  The default is
 .Dq no .  .Dq no .
 Note that this option applies to protocol version 2 only.  
 .It Cm HashKnownHosts  .It Cm HashKnownHosts
 Indicates that  Indicates that
 .Xr ssh 1  .Xr ssh 1
Line 856 
Line 854 
 .Dq no .  .Dq no .
 The default is  The default is
 .Dq no .  .Dq no .
 This option applies to protocol version 2 only and  
 is similar to  
 .Cm RhostsRSAAuthentication .  
 .It Cm HostbasedKeyTypes  .It Cm HostbasedKeyTypes
 Specifies the key types that will be used for hostbased authentication  Specifies the key types that will be used for hostbased authentication
 as a comma-separated pattern list.  as a comma-separated pattern list.
Line 883 
Line 878 
 .Xr ssh 1  .Xr ssh 1
 may be used to list supported key types.  may be used to list supported key types.
 .It Cm HostKeyAlgorithms  .It Cm HostKeyAlgorithms
 Specifies the protocol version 2 host key algorithms  Specifies the host key algorithms
 that the client wants to use in order of preference.  that the client wants to use in order of preference.
 Alternately if the specified value begins with a  Alternately if the specified value begins with a
 .Sq +  .Sq +
Line 1170 
Line 1165 
 .It Cm MACs  .It Cm MACs
 Specifies the MAC (message authentication code) algorithms  Specifies the MAC (message authentication code) algorithms
 in order of preference.  in order of preference.
 The MAC algorithm is used in protocol version 2  The MAC algorithm is used for data integrity protection.
 for data integrity protection.  
 Multiple algorithms must be comma-separated.  Multiple algorithms must be comma-separated.
 If the specified value begins with a  If the specified value begins with a
 .Sq +  .Sq +
Line 1243 
Line 1237 
 Specifies the port number to connect on the remote host.  Specifies the port number to connect on the remote host.
 The default is 22.  The default is 22.
 .It Cm PreferredAuthentications  .It Cm PreferredAuthentications
 Specifies the order in which the client should try protocol 2  Specifies the order in which the client should try authentication methods.
 authentication methods.  
 This allows a client to prefer one method (e.g.\&  This allows a client to prefer one method (e.g.\&
 .Cm keyboard-interactive )  .Cm keyboard-interactive )
 over another method (e.g.\&  over another method (e.g.\&
Line 1353 
Line 1346 
 .Dq no .  .Dq no .
 The default is  The default is
 .Dq yes .  .Dq yes .
 This option applies to protocol version 2 only.  
 .It Cm RekeyLimit  .It Cm RekeyLimit
 Specifies the maximum amount of data that may be transmitted before the  Specifies the maximum amount of data that may be transmitted before the
 session key is renegotiated, optionally followed a maximum amount of  session key is renegotiated, optionally followed a maximum amount of
Line 1379 
Line 1371 
 .Dq default none ,  .Dq default none ,
 which means that rekeying is performed after the cipher's default amount  which means that rekeying is performed after the cipher's default amount
 of data has been sent or received and no time based rekeying is done.  of data has been sent or received and no time based rekeying is done.
 This option applies to protocol version 2 only.  
 .It Cm RemoteForward  .It Cm RemoteForward
 Specifies that a TCP port on the remote machine be forwarded over  Specifies that a TCP port on the remote machine be forwarded over
 the secure channel to the specified host and port from the local machine.  the secure channel to the specified host and port from the local machine.
Line 1472 
Line 1463 
 Specifies what variables from the local  Specifies what variables from the local
 .Xr environ 7  .Xr environ 7
 should be sent to the server.  should be sent to the server.
 Note that environment passing is only supported for protocol 2.  
 The server must also support it, and the server must be configured to  The server must also support it, and the server must be configured to
 accept these environment variables.  accept these environment variables.
 Note that the  Note that the
Line 1520 
Line 1510 
 .Cm ServerAliveCountMax  .Cm ServerAliveCountMax
 is left at the default, if the server becomes unresponsive,  is left at the default, if the server becomes unresponsive,
 ssh will disconnect after approximately 45 seconds.  ssh will disconnect after approximately 45 seconds.
 This option applies to protocol version 2 only.  
 .It Cm ServerAliveInterval  .It Cm ServerAliveInterval
 Sets a timeout interval in seconds after which if no data has been received  Sets a timeout interval in seconds after which if no data has been received
 from the server,  from the server,
Line 1529 
Line 1518 
 channel to request a response from the server.  channel to request a response from the server.
 The default  The default
 is 0, indicating that these messages will not be sent to the server.  is 0, indicating that these messages will not be sent to the server.
 This option applies to protocol version 2 only.  
 .It Cm StreamLocalBindMask  .It Cm StreamLocalBindMask
 Sets the octal file creation mode mask  Sets the octal file creation mode mask
 .Pq umask  .Pq umask
Line 1726 
Line 1714 
 .Dq ask .  .Dq ask .
 The default is  The default is
 .Dq no .  .Dq no .
 Note that this option applies to protocol version 2 only.  
 .Pp  .Pp
 See also VERIFYING HOST KEYS in  See also VERIFYING HOST KEYS in
 .Xr ssh 1 .  .Xr ssh 1 .
Legend:
Removed from v.1.225  
changed lines
  Added in v.1.226