diff options
| author | Yousong Zhou <yszhou4tech@gmail.com> | 2014-03-13 16:28:16 +0800 |
|---|---|---|
| committer | Yousong Zhou <yszhou4tech@gmail.com> | 2014-03-13 16:28:16 +0800 |
| commit | 5baa10a6b6f074acdbff8988773530ce66485092 (patch) | |
| tree | 58865886f27bd8998e9f8881230efc917cb90f77 /common-session.c | |
| parent | 3e1a389629935fe179d194657730a4502a6f99f6 (diff) | |
Use AUTH_TIMEOUT only before authdone != 1.
While at it, fix a few indentations and typo.
Diffstat (limited to 'common-session.c')
| -rw-r--r-- | common-session.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/common-session.c b/common-session.c index 02eeaae..49dd8f8 100644 --- a/common-session.c +++ b/common-session.c @@ -433,12 +433,13 @@ static long select_timeout() { long ret = LONG_MAX; if (KEX_REKEY_TIMEOUT > 0) ret = MIN(KEX_REKEY_TIMEOUT, ret); - if (AUTH_TIMEOUT > 0) + /* AUTH_TIMEOUT is only relevant before authdone */ + if (sess.authstate.authdone != 1 && AUTH_TIMEOUT > 0) ret = MIN(AUTH_TIMEOUT, ret); if (opts.keepalive_secs > 0) ret = MIN(opts.keepalive_secs, ret); - if (opts.idle_timeout_secs > 0) - ret = MIN(opts.idle_timeout_secs, ret); + if (opts.idle_timeout_secs > 0) + ret = MIN(opts.idle_timeout_secs, ret); return ret; } |