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 e60a5b4ea..67e0dff9a 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 |
@@ -1427,8 +1431,15 @@ from the server, | |||
1427 | will send a message through the encrypted | 1431 | will send a message through the encrypted |
1428 | channel to request a response from the server. | 1432 | channel to request a response from the server. |
1429 | The default | 1433 | The default |
1430 | is 0, indicating that these messages will not be sent to the server. | 1434 | is 0, indicating that these messages will not be sent to the server, |
1435 | or 300 if the | ||
1436 | .Cm BatchMode | ||
1437 | option is set. | ||
1431 | This option applies to protocol version 2 only. | 1438 | This option applies to protocol version 2 only. |
1439 | .Cm ProtocolKeepAlives | ||
1440 | and | ||
1441 | .Cm SetupTimeOut | ||
1442 | are Debian-specific compatibility aliases for this option. | ||
1432 | .It Cm StreamLocalBindMask | 1443 | .It Cm StreamLocalBindMask |
1433 | Sets the octal file creation mode mask | 1444 | Sets the octal file creation mode mask |
1434 | .Pq umask | 1445 | .Pq umask |
@@ -1494,6 +1505,12 @@ Specifies whether the system should send TCP keepalive messages to the | |||
1494 | other side. | 1505 | other side. |
1495 | If they are sent, death of the connection or crash of one | 1506 | If they are sent, death of the connection or crash of one |
1496 | of the machines will be properly noticed. | 1507 | of the machines will be properly noticed. |
1508 | This option only uses TCP keepalives (as opposed to using ssh level | ||
1509 | keepalives), so takes a long time to notice when the connection dies. | ||
1510 | As such, you probably want | ||
1511 | the | ||
1512 | .Cm ServerAliveInterval | ||
1513 | option as well. | ||
1497 | However, this means that | 1514 | However, this means that |
1498 | connections will die if the route is down temporarily, and some people | 1515 | connections will die if the route is down temporarily, and some people |
1499 | find it annoying. | 1516 | find it annoying. |