[Bug 2087] sys_jitter calculation overweights sys.peer jitter.

bk: 4edfe87dtAW6uFJc_eMLjDxMIIVV1Q

diff --git a/ChangeLog b/ChangeLog
index a11a925a8393e7cc8291bbc8aa0cf820492656b9..5871539bc5faedd6fffd409a6103410b63da81da 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
 * [Bug 2082] 3-char refid sent by ntpd 4.2.6p5-RC2 ends with extra dot.
 * [Bug 2085] clock_update() sys_rootdisp calculation omits root delay.
 * [Bug 2086] get_systime() should not offset by sys_residual.
+* [Bug 2087] sys_jitter calculation overweights sys.peer jitter.
 * Ensure NULL peer->dstadr is not accessed in orphan parent selection.
 
 ---

diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
index 0a846d3cc45fd75e984363645951f2d30cc42db5..03e3593b9435e037c856cb230e99350f289a4789 100644 (file)
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -2699,8 +2699,8 @@ clock_select(void)
                if (sys_prefer == NULL) {
                        typesystem->new_status = CTL_PST_SEL_SYSPEER;
                        clock_combine(peer_list, sys_survivors);
-                       sys_jitter = SQRT(SQUARE(typesystem->jitter) +
-                           SQUARE(sys_jitter) + SQUARE(seljitter));
+                       sys_jitter = SQRT(SQUARE(sys_jitter) +
+                           SQUARE(seljitter));
                } else {
                        typesystem = sys_prefer;
                        sys_clockhop = 0;