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 dd35dd8d1..250c0d15a 100644 --- a/ssh_config.5 +++ b/ssh_config.5 | |||
@@ -233,8 +233,12 @@ Valid arguments are | |||
233 | If set to | 233 | If set to |
234 | .Dq yes , | 234 | .Dq yes , |
235 | passphrase/password querying will be disabled. | 235 | passphrase/password querying will be disabled. |
236 | In addition, the | ||
237 | .Cm ServerAliveInterval | ||
238 | option will be set to 300 seconds by default. | ||
236 | This option is useful in scripts and other batch jobs where no user | 239 | This option is useful in scripts and other batch jobs where no user |
237 | is present to supply the password. | 240 | is present to supply the password, |
241 | and where it is desirable to detect a broken network swiftly. | ||
238 | The argument must be | 242 | The argument must be |
239 | .Dq yes | 243 | .Dq yes |
240 | or | 244 | or |
@@ -1420,8 +1424,15 @@ from the server, | |||
1420 | will send a message through the encrypted | 1424 | will send a message through the encrypted |
1421 | channel to request a response from the server. | 1425 | channel to request a response from the server. |
1422 | The default | 1426 | The default |
1423 | is 0, indicating that these messages will not be sent to the server. | 1427 | is 0, indicating that these messages will not be sent to the server, |
1428 | or 300 if the | ||
1429 | .Cm BatchMode | ||
1430 | option is set. | ||
1424 | This option applies to protocol version 2 only. | 1431 | This option applies to protocol version 2 only. |
1432 | .Cm ProtocolKeepAlives | ||
1433 | and | ||
1434 | .Cm SetupTimeOut | ||
1435 | are Debian-specific compatibility aliases for this option. | ||
1425 | .It Cm StreamLocalBindMask | 1436 | .It Cm StreamLocalBindMask |
1426 | Sets the octal file creation mode mask | 1437 | Sets the octal file creation mode mask |
1427 | .Pq umask | 1438 | .Pq umask |
@@ -1487,6 +1498,12 @@ Specifies whether the system should send TCP keepalive messages to the | |||
1487 | other side. | 1498 | other side. |
1488 | If they are sent, death of the connection or crash of one | 1499 | If they are sent, death of the connection or crash of one |
1489 | of the machines will be properly noticed. | 1500 | of the machines will be properly noticed. |
1501 | This option only uses TCP keepalives (as opposed to using ssh level | ||
1502 | keepalives), so takes a long time to notice when the connection dies. | ||
1503 | As such, you probably want | ||
1504 | the | ||
1505 | .Cm ServerAliveInterval | ||
1506 | option as well. | ||
1490 | However, this means that | 1507 | However, this means that |
1491 | connections will die if the route is down temporarily, and some people | 1508 | connections will die if the route is down temporarily, and some people |
1492 | find it annoying. | 1509 | find it annoying. |