Merge whimsy.udel.edu:/deacon/backroom/ntp-stable

into  whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 45e0107aC7yGhski5u8j4gLRuQTYyA

diff --cc ntpd/ntp_loopfilter.c
index 0d1cf6e36f47767818d6be4c7836b609ea973194,d0fa466c9eb3753dc4941719829f69c15d2938f4..56b9e1cf8edddb46bdf623fc50846b381ea65057
--- 1/ntpd/ntp_loopfilter.c
--- 2/ntpd/ntp_loopfilter.c
+++ b/ntpd/ntp_loopfilter.c
@@@ -975,9 -968,9 +970,9 @@@ loop_config
                 * is zero to cancel any previous nonsense. If you don't
                 * want this initialization, remove the ntp.drift file.
                 */
 -              if (pll_control && kern_enable) {
 +              if (pll_control && kern_enable && clock_max > 0) {
                        memset((char *)&ntv, 0, sizeof(ntv));
-                       ntv.modes = MOD_FREQUENCY;
+                       ntv.modes = MOD_OFFSET | MOD_FREQUENCY;
                        ntv.freq = (int32)(drift_comp * 65536e6);
                        ntp_adjtime(&ntv);
                }