Mercurial > dropbear
diff common-session.c @ 926:b8208506322e
Use AUTH_TIMEOUT only before authdone != 1.
While at it, fix a few indentations and typo.
| author | Yousong Zhou <yszhou4tech@gmail.com> |
|---|---|
| date | Thu, 13 Mar 2014 16:28:16 +0800 |
| parents | a1a97e98b0c1 |
| children | 122fb3532038 |
line wrap: on
line diff
--- a/common-session.c Sat Mar 08 21:00:57 2014 +0800 +++ b/common-session.c Thu Mar 13 16:28:16 2014 +0800 @@ -433,12 +433,13 @@ 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; }