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 6e26ba32d..3fd0fe7b7 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, oProxyJump, | 177 | oPubkeyAcceptedKeyTypes, oProxyJump, |
178 | oProtocolKeepAlives, oSetupTimeOut, | ||
178 | oIgnore, oIgnoredUnknownOption, oDeprecated, oUnsupported | 179 | oIgnore, oIgnoredUnknownOption, oDeprecated, oUnsupported |
179 | } OpCodes; | 180 | } OpCodes; |
180 | 181 | ||
@@ -321,6 +322,8 @@ static struct { | |||
321 | { "pubkeyacceptedkeytypes", oPubkeyAcceptedKeyTypes }, | 322 | { "pubkeyacceptedkeytypes", oPubkeyAcceptedKeyTypes }, |
322 | { "ignoreunknown", oIgnoreUnknown }, | 323 | { "ignoreunknown", oIgnoreUnknown }, |
323 | { "proxyjump", oProxyJump }, | 324 | { "proxyjump", oProxyJump }, |
325 | { "protocolkeepalives", oProtocolKeepAlives }, | ||
326 | { "setuptimeout", oSetupTimeOut }, | ||
324 | 327 | ||
325 | { NULL, oBadOption } | 328 | { NULL, oBadOption } |
326 | }; | 329 | }; |
@@ -1401,6 +1404,8 @@ parse_keytypes: | |||
1401 | goto parse_flag; | 1404 | goto parse_flag; |
1402 | 1405 | ||
1403 | case oServerAliveInterval: | 1406 | case oServerAliveInterval: |
1407 | case oProtocolKeepAlives: /* Debian-specific compatibility alias */ | ||
1408 | case oSetupTimeOut: /* Debian-specific compatibility alias */ | ||
1404 | intptr = &options->server_alive_interval; | 1409 | intptr = &options->server_alive_interval; |
1405 | goto parse_time; | 1410 | goto parse_time; |
1406 | 1411 | ||
@@ -2075,8 +2080,13 @@ fill_default_options(Options * options) | |||
2075 | options->rekey_interval = 0; | 2080 | options->rekey_interval = 0; |
2076 | if (options->verify_host_key_dns == -1) | 2081 | if (options->verify_host_key_dns == -1) |
2077 | options->verify_host_key_dns = 0; | 2082 | options->verify_host_key_dns = 0; |
2078 | if (options->server_alive_interval == -1) | 2083 | if (options->server_alive_interval == -1) { |
2079 | options->server_alive_interval = 0; | 2084 | /* in batch mode, default is 5mins */ |
2085 | if (options->batch_mode == 1) | ||
2086 | options->server_alive_interval = 300; | ||
2087 | else | ||
2088 | options->server_alive_interval = 0; | ||
2089 | } | ||
2080 | if (options->server_alive_count_max == -1) | 2090 | if (options->server_alive_count_max == -1) |
2081 | options->server_alive_count_max = 3; | 2091 | options->server_alive_count_max = 3; |
2082 | if (options->control_master == -1) | 2092 | if (options->control_master == -1) |