Use AUTH_TIMEOUT only before authdone != 1.

While at it, fix a few indentations and typo.
This commit is contained in:
Yousong Zhou 2014-03-13 16:28:16 +08:00
parent 3e1a389629
commit 5baa10a6b6
3 changed files with 7 additions and 6 deletions

View File

@ -433,7 +433,8 @@ 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);

View File

@ -87,7 +87,7 @@ void write_packet() {
if (written < 0) {
if (errno == EINTR) {
m_free(iov);
TRACE2(("leave writepacket: EINTR"))
TRACE2(("leave write_packet: EINTR"))
return;
} else {
dropbear_exit("Error writing");