From 19c0bfe36b018f56c1845cae7f3772ac549c212c Mon Sep 17 00:00:00 2001 From: sthen <> Date: Thu, 19 Jul 2018 10:20:09 +0000 Subject: [PATCH] revert previous, something isn't quite right as clients see ntpd as unsynced. reported by naddy, also seen by me (I noticed because monitoring-plugins check_ntp complained). ok claudio henning --- src/usr.sbin/ntpd/ntp.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/usr.sbin/ntpd/ntp.c b/src/usr.sbin/ntpd/ntp.c index cbc70723..f48bd3ce 100644 --- a/src/usr.sbin/ntpd/ntp.c +++ b/src/usr.sbin/ntpd/ntp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ntp.c,v 1.147 2018/07/12 19:31:05 henning Exp $ */ +/* $OpenBSD: ntp.c,v 1.148 2018/07/19 10:20:09 sthen Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer @@ -316,14 +316,6 @@ ntp_main(struct ntpd_conf *nconf, struct passwd *pw, int argc, char **argv) (peer_cnt == 0 && sensors_cnt == 0))) priv_settime(0); /* no good peers, don't wait */ - if (conf->status.synced && gettime() - conf->status.reftime > - INTERVAL_QUERY_PATHETIC * QSCALE_OFF_MAX / QSCALE_OFF_MIN * - 1.2) { - /* no update seen for ~1h */ - log_info("clock is now unsynced"); - conf->status.synced = 0; - } - if (ibuf_main->w.queued > 0) pfd[PFD_PIPE_MAIN].events |= POLLOUT; if (ibuf_dns->w.queued > 0)