From dafa0203af252cf2aac0cc509c543c1301355a36 Mon Sep 17 00:00:00 2001
From: henning <>
Date: Thu, 2 Oct 2008 14:00:21 +0000
Subject: [PATCH] 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

---
 src/usr.sbin/ntpd/ntp.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/usr.sbin/ntpd/ntp.c b/src/usr.sbin/ntpd/ntp.c
index a3a6be89..0da4c3d1 100644
--- a/src/usr.sbin/ntpd/ntp.c
+++ b/src/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