summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2009-06-11 17:36:54 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2009-06-11 17:36:54 +0000
commitd9c4830414d38435685215747ee28b2092295d3a (patch)
tree4e92c0aaf6c793263b6803db84ebbd9dca345e63 /usr.sbin
parente1e7ea2999cacfd5b19b1b9bb48c468216d6f892 (diff)
effectively un-do r1.111, it fucks machines with bad clocks royally.
spotted the hard way by theo on armish, pinned to this changed by me. no cookie for ckuethe for not testing on machines with bad clocks.
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/ntpd/ntp.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/usr.sbin/ntpd/ntp.c b/usr.sbin/ntpd/ntp.c
index 9ce967d350e..9fd4f370ef0 100644
--- a/usr.sbin/ntpd/ntp.c
+++ b/usr.sbin/ntpd/ntp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ntp.c,v 1.113 2009/06/06 18:47:19 ckuethe Exp $ */
+/* $OpenBSD: ntp.c,v 1.114 2009/06/11 17:36:53 henning Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -532,11 +532,6 @@ priv_adjfreq(double offset)
return;
}
- if (conf->filters & FILTER_ADJFREQ){
- conf->filters &= ~FILTER_ADJFREQ;
- return;
- }
-
conf->freq.samples++;
if (conf->freq.samples <= 0)