diff options
Diffstat (limited to 'readconf.c')
-rw-r--r-- | readconf.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/readconf.c b/readconf.c index b069333fa..3d0a812b3 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -176,6 +176,7 @@ typedef enum { | |||
176 | oFingerprintHash, oUpdateHostkeys, oHostbasedKeyTypes, | 176 | oFingerprintHash, oUpdateHostkeys, oHostbasedKeyTypes, |
177 | oPubkeyAcceptedKeyTypes, oCASignatureAlgorithms, oProxyJump, | 177 | oPubkeyAcceptedKeyTypes, oCASignatureAlgorithms, oProxyJump, |
178 | oSecurityKeyProvider, | 178 | oSecurityKeyProvider, |
179 | oProtocolKeepAlives, oSetupTimeOut, | ||
179 | oIgnore, oIgnoredUnknownOption, oDeprecated, oUnsupported | 180 | oIgnore, oIgnoredUnknownOption, oDeprecated, oUnsupported |
180 | } OpCodes; | 181 | } OpCodes; |
181 | 182 | ||
@@ -326,6 +327,8 @@ static struct { | |||
326 | { "ignoreunknown", oIgnoreUnknown }, | 327 | { "ignoreunknown", oIgnoreUnknown }, |
327 | { "proxyjump", oProxyJump }, | 328 | { "proxyjump", oProxyJump }, |
328 | { "securitykeyprovider", oSecurityKeyProvider }, | 329 | { "securitykeyprovider", oSecurityKeyProvider }, |
330 | { "protocolkeepalives", oProtocolKeepAlives }, | ||
331 | { "setuptimeout", oSetupTimeOut }, | ||
329 | 332 | ||
330 | { NULL, oBadOption } | 333 | { NULL, oBadOption } |
331 | }; | 334 | }; |
@@ -1534,6 +1537,8 @@ parse_keytypes: | |||
1534 | goto parse_flag; | 1537 | goto parse_flag; |
1535 | 1538 | ||
1536 | case oServerAliveInterval: | 1539 | case oServerAliveInterval: |
1540 | case oProtocolKeepAlives: /* Debian-specific compatibility alias */ | ||
1541 | case oSetupTimeOut: /* Debian-specific compatibility alias */ | ||
1537 | intptr = &options->server_alive_interval; | 1542 | intptr = &options->server_alive_interval; |
1538 | goto parse_time; | 1543 | goto parse_time; |
1539 | 1544 | ||
@@ -2266,8 +2271,13 @@ fill_default_options(Options * options) | |||
2266 | options->rekey_interval = 0; | 2271 | options->rekey_interval = 0; |
2267 | if (options->verify_host_key_dns == -1) | 2272 | if (options->verify_host_key_dns == -1) |
2268 | options->verify_host_key_dns = 0; | 2273 | options->verify_host_key_dns = 0; |
2269 | if (options->server_alive_interval == -1) | 2274 | if (options->server_alive_interval == -1) { |
2270 | options->server_alive_interval = 0; | 2275 | /* in batch mode, default is 5mins */ |
2276 | if (options->batch_mode == 1) | ||
2277 | options->server_alive_interval = 300; | ||
2278 | else | ||
2279 | options->server_alive_interval = 0; | ||
2280 | } | ||
2271 | if (options->server_alive_count_max == -1) | 2281 | if (options->server_alive_count_max == -1) |
2272 | options->server_alive_count_max = 3; | 2282 | options->server_alive_count_max = 3; |
2273 | if (options->control_master == -1) | 2283 | if (options->control_master == -1) |