| author | Channappa BV<channappa.vakkalad@oracle.com> |
| Thu, 03 Nov 2016 22:18:09 -0700 | |
| changeset 7244 | 0d8fd6bb915f |
| parent 6482 | d5493015b12e |
| permissions | -rw-r--r-- |
|
6482
d5493015b12e
23522230 Upgrade NTP to version 4.2.8p8
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
1 |
The root dispersion calculation incorrectly stopped using the peer dispersion |
|
d5493015b12e
23522230 Upgrade NTP to version 4.2.8p8
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
2 |
term when testing the acceptability of a NTP sever. |
|
d5493015b12e
23522230 Upgrade NTP to version 4.2.8p8
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
3 |
|
|
d5493015b12e
23522230 Upgrade NTP to version 4.2.8p8
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
4 |
This has been reported as NTP community bug 3093 |
|
d5493015b12e
23522230 Upgrade NTP to version 4.2.8p8
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
5 |
http://bugs.ntp.org/show_bug.cgi?id=3093 |
|
d5493015b12e
23522230 Upgrade NTP to version 4.2.8p8
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
6 |
This patch may be removed when upgrading to a version of NTP with that bug |
|
d5493015b12e
23522230 Upgrade NTP to version 4.2.8p8
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
7 |
fixed. |
|
d5493015b12e
23522230 Upgrade NTP to version 4.2.8p8
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
8 |
|
|
d5493015b12e
23522230 Upgrade NTP to version 4.2.8p8
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
9 |
--- ntpd/ntp_proto.c |
|
d5493015b12e
23522230 Upgrade NTP to version 4.2.8p8
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
10 |
+++ ntpd/ntp_proto.c |
|
d5493015b12e
23522230 Upgrade NTP to version 4.2.8p8
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
11 |
@@ -4338,7 +4338,7 @@ peer_unfit( |
|
d5493015b12e
23522230 Upgrade NTP to version 4.2.8p8
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
12 |
* plus the increment due to one host poll interval. |
|
d5493015b12e
23522230 Upgrade NTP to version 4.2.8p8
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
13 |
*/ |
|
d5493015b12e
23522230 Upgrade NTP to version 4.2.8p8
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
14 |
if ( !(peer->flags & FLAG_REFCLOCK) |
|
d5493015b12e
23522230 Upgrade NTP to version 4.2.8p8
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
15 |
- && root_distance(peer) >= sys_maxdist |
|
d5493015b12e
23522230 Upgrade NTP to version 4.2.8p8
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
16 |
+ && (root_distance(peer) + peer->disp) >= sys_maxdist |
|
d5493015b12e
23522230 Upgrade NTP to version 4.2.8p8
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
17 |
+ clock_phi * ULOGTOD(peer->hpoll)) |
|
d5493015b12e
23522230 Upgrade NTP to version 4.2.8p8
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
18 |
rval |= TEST11; /* distance exceeded */ |
|
d5493015b12e
23522230 Upgrade NTP to version 4.2.8p8
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
19 |