summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-04-29 19:49:14 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-04-29 19:49:14 +0000
commit2f0304c768a2f44b78471a258b2dd7ce9acc199b (patch)
treea579d1da6abb222623cb6d21ae7fedfc4f268297
parentd240122ee8e442c68ca17ebd1f8985c58be0f9a5 (diff)
- markus@cvs.openbsd.org 2001/04/29 18:32:52
[serverloop.c] fix whitespace
-rw-r--r--ChangeLog8
-rw-r--r--serverloop.c8
2 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 477dc0312..1cb100afc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
120010450
2 - OpenBSD CVS Sync
3 - markus@cvs.openbsd.org 2001/04/29 18:32:52
4 [serverloop.c]
5 fix whitespace
6
120010429 720010429
2 - (bal) Updated INSTALL. PCRE moved to a new place. 8 - (bal) Updated INSTALL. PCRE moved to a new place.
3 - (djm) Release OpenSSH-2.9p1 9 - (djm) Release OpenSSH-2.9p1
@@ -5271,4 +5277,4 @@
5271 - Wrote replacements for strlcpy and mkdtemp 5277 - Wrote replacements for strlcpy and mkdtemp
5272 - Released 1.0pre1 5278 - Released 1.0pre1
5273 5279
5274$Id: ChangeLog,v 1.1180 2001/04/29 10:45:50 djm Exp $ 5280$Id: ChangeLog,v 1.1181 2001/04/29 19:49:14 mouring Exp $
diff --git a/serverloop.c b/serverloop.c
index 5a5b1e37f..1687fd102 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -35,7 +35,7 @@
35 */ 35 */
36 36
37#include "includes.h" 37#include "includes.h"
38RCSID("$OpenBSD: serverloop.c,v 1.61 2001/04/13 22:46:54 beck Exp $"); 38RCSID("$OpenBSD: serverloop.c,v 1.62 2001/04/29 18:32:52 markus Exp $");
39 39
40#include "xmalloc.h" 40#include "xmalloc.h"
41#include "packet.h" 41#include "packet.h"
@@ -203,10 +203,10 @@ wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp, int *maxfdp,
203 * analysis more difficult, but we're not doing it yet. 203 * analysis more difficult, but we're not doing it yet.
204 */ 204 */
205 if (max_time_milliseconds == 0 && options.client_alive_interval) { 205 if (max_time_milliseconds == 0 && options.client_alive_interval) {
206 client_alive_scheduled = 1; 206 client_alive_scheduled = 1;
207 max_time_milliseconds = options.client_alive_interval * 1000; 207 max_time_milliseconds = options.client_alive_interval * 1000;
208 } else 208 } else
209 client_alive_scheduled = 0; 209 client_alive_scheduled = 0;
210 210
211 /* When select fails we restart from here. */ 211 /* When select fails we restart from here. */
212retry_select: 212retry_select:
@@ -746,7 +746,7 @@ server_input_channel_failure(int type, int plen, void *ctxt)
746{ 746{
747 debug("Got CHANNEL_FAILURE for keepalive"); 747 debug("Got CHANNEL_FAILURE for keepalive");
748 /* 748 /*
749 * reset timeout, since we got a sane answer from the client. 749 * reset timeout, since we got a sane answer from the client.
750 * even if this was generated by something other than 750 * even if this was generated by something other than
751 * the bogus CHANNEL_REQUEST we send for keepalives. 751 * the bogus CHANNEL_REQUEST we send for keepalives.
752 */ 752 */