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 1f1be7789..7f2b5c172 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -174,6 +174,7 @@ typedef enum { | |||
174 | oStreamLocalBindMask, oStreamLocalBindUnlink, oRevokedHostKeys, | 174 | oStreamLocalBindMask, oStreamLocalBindUnlink, oRevokedHostKeys, |
175 | oFingerprintHash, oUpdateHostkeys, oHostbasedKeyTypes, | 175 | oFingerprintHash, oUpdateHostkeys, oHostbasedKeyTypes, |
176 | oPubkeyAcceptedKeyTypes, oProxyJump, | 176 | oPubkeyAcceptedKeyTypes, oProxyJump, |
177 | oProtocolKeepAlives, oSetupTimeOut, | ||
177 | oIgnore, oIgnoredUnknownOption, oDeprecated, oUnsupported | 178 | oIgnore, oIgnoredUnknownOption, oDeprecated, oUnsupported |
178 | } OpCodes; | 179 | } OpCodes; |
179 | 180 | ||
@@ -319,6 +320,8 @@ static struct { | |||
319 | { "pubkeyacceptedkeytypes", oPubkeyAcceptedKeyTypes }, | 320 | { "pubkeyacceptedkeytypes", oPubkeyAcceptedKeyTypes }, |
320 | { "ignoreunknown", oIgnoreUnknown }, | 321 | { "ignoreunknown", oIgnoreUnknown }, |
321 | { "proxyjump", oProxyJump }, | 322 | { "proxyjump", oProxyJump }, |
323 | { "protocolkeepalives", oProtocolKeepAlives }, | ||
324 | { "setuptimeout", oSetupTimeOut }, | ||
322 | 325 | ||
323 | { NULL, oBadOption } | 326 | { NULL, oBadOption } |
324 | }; | 327 | }; |
@@ -1378,6 +1381,8 @@ parse_keytypes: | |||
1378 | goto parse_flag; | 1381 | goto parse_flag; |
1379 | 1382 | ||
1380 | case oServerAliveInterval: | 1383 | case oServerAliveInterval: |
1384 | case oProtocolKeepAlives: /* Debian-specific compatibility alias */ | ||
1385 | case oSetupTimeOut: /* Debian-specific compatibility alias */ | ||
1381 | intptr = &options->server_alive_interval; | 1386 | intptr = &options->server_alive_interval; |
1382 | goto parse_time; | 1387 | goto parse_time; |
1383 | 1388 | ||
@@ -2019,8 +2024,13 @@ fill_default_options(Options * options) | |||
2019 | options->rekey_interval = 0; | 2024 | options->rekey_interval = 0; |
2020 | if (options->verify_host_key_dns == -1) | 2025 | if (options->verify_host_key_dns == -1) |
2021 | options->verify_host_key_dns = 0; | 2026 | options->verify_host_key_dns = 0; |
2022 | if (options->server_alive_interval == -1) | 2027 | if (options->server_alive_interval == -1) { |
2023 | options->server_alive_interval = 0; | 2028 | /* in batch mode, default is 5mins */ |
2029 | if (options->batch_mode == 1) | ||
2030 | options->server_alive_interval = 300; | ||
2031 | else | ||
2032 | options->server_alive_interval = 0; | ||
2033 | } | ||
2024 | if (options->server_alive_count_max == -1) | 2034 | if (options->server_alive_count_max == -1) |
2025 | options->server_alive_count_max = 3; | 2035 | options->server_alive_count_max = 3; |
2026 | if (options->control_master == -1) | 2036 | if (options->control_master == -1) |