From 178fa66a6451d890083d2441a2de207bdb74a348 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Fri, 5 Nov 2004 20:09:09 +1100 Subject: - mickey@cvs.openbsd.org 2004/09/15 18:42:27 [sshd.c] use less doubles in daemons; markus@ ok --- ChangeLog | 5 ++++- sshd.c | 9 ++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6316a4de0..70fc70cc3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,9 @@ From Michael Knudsen, with wording changed slightly to match the PrintMotd description. ok djm + - mickey@cvs.openbsd.org 2004/09/15 18:42:27 + [sshd.c] + use less doubles in daemons; markus@ ok 20041102 - (dtucker) [configure.ac includes.h] Bug #947: Fix compile error on HP-UX @@ -1802,4 +1805,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3567 2004/11/05 09:06:59 dtucker Exp $ +$Id: ChangeLog,v 1.3568 2004/11/05 09:09:09 dtucker Exp $ diff --git a/sshd.c b/sshd.c index 4b2d10af9..2afe316cf 100644 --- a/sshd.c +++ b/sshd.c @@ -42,7 +42,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshd.c,v 1.302 2004/08/28 01:01:48 djm Exp $"); +RCSID("$OpenBSD: sshd.c,v 1.303 2004/09/15 18:42:27 mickey Exp $"); #include #include @@ -750,7 +750,7 @@ get_hostkey_index(Key *key) static int drop_connection(int startups) { - double p, r; + int p, r; if (startups < options.max_startups_begin) return 0; @@ -761,10 +761,9 @@ drop_connection(int startups) p = 100 - options.max_startups_rate; p *= startups - options.max_startups_begin; - p /= (double) (options.max_startups - options.max_startups_begin); + p /= options.max_startups - options.max_startups_begin; p += options.max_startups_rate; - p /= 100.0; - r = arc4random() / (double) UINT_MAX; + r = arc4random() % 100; debug("drop_connection: p %g, r %g", p, r); return (r < p) ? 1 : 0; -- cgit v1.2.3