summaryrefslogtreecommitdiff
path: root/serverloop.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2012-06-20 22:31:26 +1000
committerDamien Miller <djm@mindrot.org>2012-06-20 22:31:26 +1000
commit6c6da33d31c898781ffb45c5d10502b0f84dd4a4 (patch)
tree79bca7662353429b63bf3bf2d10aa1b7e2944761 /serverloop.c
parentf8268503d1b71f6cae4609a1c83b403f71a71bad (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
Diffstat (limited to 'serverloop.c')
-rw-r--r--serverloop.c4
1 files changed, 2 insertions, 2 deletions
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