mirror of
https://github.com/clearml/dropbear
synced 2025-06-08 23:48:19 +00:00
Use AUTH_TIMEOUT only before authdone != 1.
While at it, fix a few indentations and typo.
This commit is contained in:
parent
3e1a389629
commit
5baa10a6b6
@ -433,7 +433,8 @@ static long select_timeout() {
|
|||||||
long ret = LONG_MAX;
|
long ret = LONG_MAX;
|
||||||
if (KEX_REKEY_TIMEOUT > 0)
|
if (KEX_REKEY_TIMEOUT > 0)
|
||||||
ret = MIN(KEX_REKEY_TIMEOUT, ret);
|
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);
|
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);
|
||||||
|
2
packet.c
2
packet.c
@ -87,7 +87,7 @@ void write_packet() {
|
|||||||
if (written < 0) {
|
if (written < 0) {
|
||||||
if (errno == EINTR) {
|
if (errno == EINTR) {
|
||||||
m_free(iov);
|
m_free(iov);
|
||||||
TRACE2(("leave writepacket: EINTR"))
|
TRACE2(("leave write_packet: EINTR"))
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
dropbear_exit("Error writing");
|
dropbear_exit("Error writing");
|
||||||
|
Loading…
Reference in New Issue
Block a user