diff options
author | Damien Miller <djm@mindrot.org> | 2012-06-20 22:31:26 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2012-06-20 22:31:26 +1000 |
commit | 6c6da33d31c898781ffb45c5d10502b0f84dd4a4 (patch) | |
tree | 79bca7662353429b63bf3bf2d10aa1b7e2944761 | |
parent | f8268503d1b71f6cae4609a1c83b403f71a71bad (diff) |
- djm@cvs.openbsd.org 2012/06/20 04:42:58
[clientloop.c serverloop.c]
initialise accept() backoff timer to avoid EINVAL from select(2) in
rekeying
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | clientloop.c | 4 | ||||
-rw-r--r-- | serverloop.c | 4 |
3 files changed, 8 insertions, 4 deletions
@@ -50,6 +50,10 @@ | |||
50 | - jmc@cvs.openbsd.org 2012/06/19 21:35:54 | 50 | - jmc@cvs.openbsd.org 2012/06/19 21:35:54 |
51 | [sshd_config.5] | 51 | [sshd_config.5] |
52 | tweak previous; ok markus | 52 | tweak previous; ok markus |
53 | - djm@cvs.openbsd.org 2012/06/20 04:42:58 | ||
54 | [clientloop.c serverloop.c] | ||
55 | initialise accept() backoff timer to avoid EINVAL from select(2) in | ||
56 | rekeying | ||
53 | 57 | ||
54 | 20120519 | 58 | 20120519 |
55 | - (dtucker) [configure.ac] bz#2010: fix non-portable shell construct. Patch | 59 | - (dtucker) [configure.ac] bz#2010: fix non-portable shell construct. Patch |
diff --git a/clientloop.c b/clientloop.c index 58357cf39..1c1a77088 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: clientloop.c,v 1.239 2012/04/11 13:16:19 djm Exp $ */ | 1 | /* $OpenBSD: clientloop.c,v 1.240 2012/06/20 04:42:58 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -583,7 +583,7 @@ client_wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp, | |||
583 | { | 583 | { |
584 | struct timeval tv, *tvp; | 584 | struct timeval tv, *tvp; |
585 | int timeout_secs; | 585 | int timeout_secs; |
586 | time_t minwait_secs; | 586 | time_t minwait_secs = 0; |
587 | int ret; | 587 | int ret; |
588 | 588 | ||
589 | /* Add any selections by the channel mechanism. */ | 589 | /* Add any selections by the channel mechanism. */ |
diff --git a/serverloop.c b/serverloop.c index 50be16b7c..741c5befb 100644 --- a/serverloop.c +++ b/serverloop.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: serverloop.c,v 1.161 2012/04/11 13:16:19 djm Exp $ */ | 1 | /* $OpenBSD: serverloop.c,v 1.162 2012/06/20 04:42:58 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -281,7 +281,7 @@ wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp, int *maxfdp, | |||
281 | { | 281 | { |
282 | struct timeval tv, *tvp; | 282 | struct timeval tv, *tvp; |
283 | int ret; | 283 | int ret; |
284 | time_t minwait_secs; | 284 | time_t minwait_secs = 0; |
285 | int client_alive_scheduled = 0; | 285 | int client_alive_scheduled = 0; |
286 | int program_alive_scheduled = 0; | 286 | int program_alive_scheduled = 0; |
287 | 287 | ||