diff options
Diffstat (limited to 'ssh_config.5')
-rw-r--r-- | ssh_config.5 | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index 707d0e1c3..efc265ab7 100644 --- a/ssh_config.5 +++ b/ssh_config.5 | |||
@@ -268,8 +268,12 @@ The default is | |||
268 | If set to | 268 | If set to |
269 | .Dq yes , | 269 | .Dq yes , |
270 | passphrase/password querying will be disabled. | 270 | passphrase/password querying will be disabled. |
271 | In addition, the | ||
272 | .Cm ServerAliveInterval | ||
273 | option will be set to 300 seconds by default. | ||
271 | This option is useful in scripts and other batch jobs where no user | 274 | This option is useful in scripts and other batch jobs where no user |
272 | is present to supply the password. | 275 | is present to supply the password, |
276 | and where it is desirable to detect a broken network swiftly. | ||
273 | The argument must be | 277 | The argument must be |
274 | .Dq yes | 278 | .Dq yes |
275 | or | 279 | or |
@@ -1624,7 +1628,14 @@ from the server, | |||
1624 | will send a message through the encrypted | 1628 | will send a message through the encrypted |
1625 | channel to request a response from the server. | 1629 | channel to request a response from the server. |
1626 | The default | 1630 | The default |
1627 | is 0, indicating that these messages will not be sent to the server. | 1631 | is 0, indicating that these messages will not be sent to the server, |
1632 | or 300 if the | ||
1633 | .Cm BatchMode | ||
1634 | option is set. | ||
1635 | .Cm ProtocolKeepAlives | ||
1636 | and | ||
1637 | .Cm SetupTimeOut | ||
1638 | are Debian-specific compatibility aliases for this option. | ||
1628 | .It Cm StreamLocalBindMask | 1639 | .It Cm StreamLocalBindMask |
1629 | Sets the octal file creation mode mask | 1640 | Sets the octal file creation mode mask |
1630 | .Pq umask | 1641 | .Pq umask |
@@ -1690,6 +1701,12 @@ Specifies whether the system should send TCP keepalive messages to the | |||
1690 | other side. | 1701 | other side. |
1691 | If they are sent, death of the connection or crash of one | 1702 | If they are sent, death of the connection or crash of one |
1692 | of the machines will be properly noticed. | 1703 | of the machines will be properly noticed. |
1704 | This option only uses TCP keepalives (as opposed to using ssh level | ||
1705 | keepalives), so takes a long time to notice when the connection dies. | ||
1706 | As such, you probably want | ||
1707 | the | ||
1708 | .Cm ServerAliveInterval | ||
1709 | option as well. | ||
1693 | However, this means that | 1710 | However, this means that |
1694 | connections will die if the route is down temporarily, and some people | 1711 | connections will die if the route is down temporarily, and some people |
1695 | find it annoying. | 1712 | find it annoying. |