diff options
| author |   djm <djm@openbsd.org> | 2012-06-20 04:42:58 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2012-06-20 04:42:58 +0000 |
| commit | 5c8cdfd324993db24286d9dd26b90fac36105ecf (patch) | |
| tree | 6cc4db0fe23c53382efcd9c4d139dfa02ab23613 | |
| parent | tweak previous; ok markus (diff) | |
| download | wireguard-openbsd-5c8cdfd324993db24286d9dd26b90fac36105ecf.tar.xz wireguard-openbsd-5c8cdfd324993db24286d9dd26b90fac36105ecf.zip | |
initialise accept() backoff timer to avoid EINVAL from select(2) in
rekeying
| -rw-r--r-- | usr.bin/ssh/clientloop.c | 4 | ||||
| -rw-r--r-- | usr.bin/ssh/serverloop.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/ssh/clientloop.c b/usr.bin/ssh/clientloop.c index f2d7169d462..81008a4a11d 100644 --- a/usr.bin/ssh/clientloop.c +++ b/usr.bin/ssh/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 @@ -575,7 +575,7 @@ client_wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp, { 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/usr.bin/ssh/serverloop.c b/usr.bin/ssh/serverloop.c index a888443a579..2105cc818ff 100644 --- a/usr.bin/ssh/serverloop.c +++ b/usr.bin/ssh/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 @@ -275,7 +275,7 @@ wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp, int *maxfdp, { struct timeval tv, *tvp; int ret; - time_t minwait_secs; + time_t minwait_secs = 0; int client_alive_scheduled = 0; /* Allocate and update select() masks for channel descriptors. */ |