This commit is contained in:
Matt Johnston 2014-03-13 23:08:47 +08:00
parent 5baa10a6b6
commit 2b599df57a

View File

@ -434,7 +434,7 @@ static long select_timeout() {
if (KEX_REKEY_TIMEOUT > 0) if (KEX_REKEY_TIMEOUT > 0)
ret = MIN(KEX_REKEY_TIMEOUT, ret); ret = MIN(KEX_REKEY_TIMEOUT, ret);
/* AUTH_TIMEOUT is only relevant before authdone */ /* AUTH_TIMEOUT is only relevant before authdone */
if (sess.authstate.authdone != 1 && AUTH_TIMEOUT > 0) if (ses.authstate.authdone != 1 && AUTH_TIMEOUT > 0)
ret = MIN(AUTH_TIMEOUT, ret); ret = MIN(AUTH_TIMEOUT, ret);
if (opts.keepalive_secs > 0) if (opts.keepalive_secs > 0)
ret = MIN(opts.keepalive_secs, ret); ret = MIN(opts.keepalive_secs, ret);