summaryrefslogtreecommitdiffhomepage
path: root/common-session.c
diff options
context:
space:
mode:
Diffstat (limited to 'common-session.c')
-rw-r--r--common-session.c7
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;
}