diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2008-10-02 14:00:22 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2008-10-02 14:00:22 +0000 |
| commit | 4bb7b1f9b1fdd00548ba0fc17325da0c87b7d138 (patch) | |
| tree | d4ab6ac8cf2f5cb8aac28696b8d9764bb8bf531a /usr.sbin/ntpd/ntp.c | |
| parent | 1a16a563fc0ddb07fb714972b77c52b21533eda5 (diff) | |
in priv_settime(), we must not adjust the 'next' timestamps on their for
the offset since we use monotime for these for some time now, and monotime
is not affected by system time changes (like, duh, that was the reason for
the change). PR5927
Diffstat (limited to 'usr.sbin/ntpd/ntp.c')
| -rw-r--r-- | usr.sbin/ntpd/ntp.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/usr.sbin/ntpd/ntp.c b/usr.sbin/ntpd/ntp.c index a3a6be89166..0da4c3d1226 100644 --- a/usr.sbin/ntpd/ntp.c +++ b/usr.sbin/ntpd/ntp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ntp.c,v 1.107 2008/09/12 10:46:09 henning Exp $ */ +/* $OpenBSD: ntp.c,v 1.108 2008/10/02 14:00:21 henning Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -674,17 +674,8 @@ offset_compare(const void *aa, const void *bb) void priv_settime(double offset) { - struct ntp_peer *p; - imsg_compose(ibuf_main, IMSG_SETTIME, 0, 0, &offset, sizeof(offset)); conf->settime = 0; - - TAILQ_FOREACH(p, &conf->ntp_peers, entry) { - if (p->next) - p->next -= offset; - if (p->deadline) - p->deadline -= offset; - } } void |