- 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
diff --git a/ChangeLog b/ChangeLog
index d1ad692..6f9031f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -50,6 +50,10 @@
- jmc@cvs.openbsd.org 2012/06/19 21:35:54
[sshd_config.5]
tweak previous; ok markus
+ - 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
20120519
- (dtucker) [configure.ac] bz#2010: fix non-portable shell construct. Patch
diff --git a/clientloop.c b/clientloop.c
index 58357cf..1c1a770 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.239 2012/04/11 13:16:19 djm Exp $ */
+/* $OpenBSD: clientloop.c,v 1.240 2012/06/20 04:42:58 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -583,7 +583,7 @@
{
struct timeval tv, *tvp;
int timeout_secs;
- time_t minwait_secs;
+ time_t minwait_secs = 0;
int ret;
/* Add any selections by the channel mechanism. */
diff --git a/serverloop.c b/serverloop.c
index 50be16b..741c5be 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: serverloop.c,v 1.161 2012/04/11 13:16:19 djm Exp $ */
+/* $OpenBSD: serverloop.c,v 1.162 2012/06/20 04:42:58 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -281,7 +281,7 @@
{
struct timeval tv, *tvp;
int ret;
- time_t minwait_secs;
+ time_t minwait_secs = 0;
int client_alive_scheduled = 0;
int program_alive_scheduled = 0;