diff options
| author |   sthen <sthen@openbsd.org> | 2018-07-19 10:20:09 +0000 |
|---|---|---|
| committer | sthen <sthen@openbsd.org> | 2018-07-19 10:20:09 +0000 |
| commit | d4189bb039db402bffe9156c65ddfb614a098ac9 (patch) | |
| tree | 68dd28d9d5767dc1a5aecc26ab5d8f40ff96dfd8 | |
| parent | ieee80211_ess_is_better() returns 0 or 1, comparing > 1 is always (diff) | |
| download | wireguard-openbsd-d4189bb039db402bffe9156c65ddfb614a098ac9.tar.xz wireguard-openbsd-d4189bb039db402bffe9156c65ddfb614a098ac9.zip | |
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
| -rw-r--r-- | usr.sbin/ntpd/ntp.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/usr.sbin/ntpd/ntp.c b/usr.sbin/ntpd/ntp.c index cbc70723d7f..f48bd3cee1b 100644 --- a/usr.sbin/ntpd/ntp.c +++ b/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 <henning@openbsd.org> @@ -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) |