From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 23 Nov 2007 02:30:50 +0000 (-0500)
Subject: Fix typos in the [Bug 963] patch
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=66cb2ad82ba01a7b142a15ff7fb2c2228c95a086;p=thirdparty%2Fntp.git

Fix typos in the [Bug 963] patch

bk: 47463b5afUoNw0p7ob1Gz4kaviG55w
---

diff --git a/ChangeLog b/ChangeLog
index e021caf70a..251101d8f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Fix typos in the [Bug 963] patch.
 * bootstrap: squawk if genver fails.  Use -f with cp in case Dave does a chown.
 * Remove obsolete simulator command-line options.
 * ntp_request.c: [CID 36] zero sin_zero.
diff --git a/libntp/systime.c b/libntp/systime.c
index 95acf50051..c1ddd3d8ce 100644
--- a/libntp/systime.c
+++ b/libntp/systime.c
@@ -98,7 +98,7 @@ get_systime(
 	 */
 	GETTIMEOFDAY(&tv, NULL);
 	now->l_i = tv.tv_sec + JAN_1970;
-	dtemp = ts.tv_usec + (ntp_random() * 2. / FRAC) * sys_tick *
+	dtemp = tv.tv_usec + (ntp_random() * 2. / FRAC) * sys_tick *
 	    1e6;
 	dtemp = dtemp / 1e6 + sys_residual;
 	if (dtemp >= 1.) {
diff --git a/ntpd/ntp_io.c b/ntpd/ntp_io.c
index 02d53a7f2b..3f83652a34 100644
--- a/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@ -3005,7 +3005,7 @@ static l_fp
 			l_fp nts;
 			DPRINTF(4, ("fetch_timestamp: system network time stamp: %ld.%06ld\n", tvp->tv_sec, tvp->tv_usec));
 			nts.l_i = tvp->tv_sec + JAN_1970;
-			dtemp = (tvp->tv_usec + (ntp_random() * 2. / FRAC) /
+			dtemp = (tvp->tv_usec + (ntp_random() * 2. / FRAC)) /
 			    1e6;
 			nts.l_uf = (u_int32)(dtemp * FRAC);
 #ifdef DEBUG_TIMING