If "prefer" is set, only huffpuff to the preferred peer. From Dave Mills.

bk: 41c783e442BRHVhRZJsKPhBAo7bb7w

diff --git a/ntpd/ntp_loopfilter.c b/ntpd/ntp_loopfilter.c
index f2f78b33d2081c5d56d4b028e5af24bc1af832ce..68dde790182cfa6129d3842dcc2d3b3b3158af2b 100644 (file)
--- a/ntpd/ntp_loopfilter.c
+++ b/ntpd/ntp_loopfilter.c
@@ -290,8 +290,12 @@ local_clock(
         * is most effective if the delays are highly assymetric and
         * clockhopping is avoided and the clock frequency wander is
         * relatively small.
+        *
+        * Note either there is no prefer peer or this update is from
+        * the prefer peer.
         */
-       if (sys_huffpuff != NULL) {
+       if (sys_huffpuff != NULL && (sys_prefer == NULL || sys_prefer ==
+           peer)) {
                if (peer->delay < sys_huffpuff[sys_huffptr])
                        sys_huffpuff[sys_huffptr] = peer->delay;
                if (peer->delay < sys_mindly)