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 5e655e924..052d4b1ac 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -175,6 +175,7 @@ typedef enum { | |||
175 | oStreamLocalBindMask, oStreamLocalBindUnlink, oRevokedHostKeys, | 175 | oStreamLocalBindMask, oStreamLocalBindUnlink, oRevokedHostKeys, |
176 | oFingerprintHash, oUpdateHostkeys, oHostbasedKeyTypes, | 176 | oFingerprintHash, oUpdateHostkeys, oHostbasedKeyTypes, |
177 | oPubkeyAcceptedKeyTypes, oCASignatureAlgorithms, oProxyJump, | 177 | oPubkeyAcceptedKeyTypes, oCASignatureAlgorithms, oProxyJump, |
178 | oProtocolKeepAlives, oSetupTimeOut, | ||
178 | oIgnore, oIgnoredUnknownOption, oDeprecated, oUnsupported | 179 | oIgnore, oIgnoredUnknownOption, oDeprecated, oUnsupported |
179 | } OpCodes; | 180 | } OpCodes; |
180 | 181 | ||
@@ -322,6 +323,8 @@ static struct { | |||
322 | { "pubkeyacceptedkeytypes", oPubkeyAcceptedKeyTypes }, | 323 | { "pubkeyacceptedkeytypes", oPubkeyAcceptedKeyTypes }, |
323 | { "ignoreunknown", oIgnoreUnknown }, | 324 | { "ignoreunknown", oIgnoreUnknown }, |
324 | { "proxyjump", oProxyJump }, | 325 | { "proxyjump", oProxyJump }, |
326 | { "protocolkeepalives", oProtocolKeepAlives }, | ||
327 | { "setuptimeout", oSetupTimeOut }, | ||
325 | 328 | ||
326 | { NULL, oBadOption } | 329 | { NULL, oBadOption } |
327 | }; | 330 | }; |
@@ -1415,6 +1418,8 @@ parse_keytypes: | |||
1415 | goto parse_flag; | 1418 | goto parse_flag; |
1416 | 1419 | ||
1417 | case oServerAliveInterval: | 1420 | case oServerAliveInterval: |
1421 | case oProtocolKeepAlives: /* Debian-specific compatibility alias */ | ||
1422 | case oSetupTimeOut: /* Debian-specific compatibility alias */ | ||
1418 | intptr = &options->server_alive_interval; | 1423 | intptr = &options->server_alive_interval; |
1419 | goto parse_time; | 1424 | goto parse_time; |
1420 | 1425 | ||
@@ -2101,8 +2106,13 @@ fill_default_options(Options * options) | |||
2101 | options->rekey_interval = 0; | 2106 | options->rekey_interval = 0; |
2102 | if (options->verify_host_key_dns == -1) | 2107 | if (options->verify_host_key_dns == -1) |
2103 | options->verify_host_key_dns = 0; | 2108 | options->verify_host_key_dns = 0; |
2104 | if (options->server_alive_interval == -1) | 2109 | if (options->server_alive_interval == -1) { |
2105 | options->server_alive_interval = 0; | 2110 | /* in batch mode, default is 5mins */ |
2111 | if (options->batch_mode == 1) | ||
2112 | options->server_alive_interval = 300; | ||
2113 | else | ||
2114 | options->server_alive_interval = 0; | ||
2115 | } | ||
2106 | if (options->server_alive_count_max == -1) | 2116 | if (options->server_alive_count_max == -1) |
2107 | options->server_alive_count_max = 3; | 2117 | options->server_alive_count_max = 3; |
2108 | if (options->control_master == -1) | 2118 | if (options->control_master == -1) |