summaryrefslogtreecommitdiff
path: root/usr.sbin/ntpd
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin/ntpd')
-rw-r--r--usr.sbin/ntpd/ntp.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.sbin/ntpd/ntp.c b/usr.sbin/ntpd/ntp.c
index 468d5503bd2..12c11869154 100644
--- a/usr.sbin/ntpd/ntp.c
+++ b/usr.sbin/ntpd/ntp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ntp.c,v 1.17 2004/07/08 15:06:13 henning Exp $ */
+/* $OpenBSD: ntp.c,v 1.18 2004/07/09 10:22:07 henning Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -168,7 +168,9 @@ ntp_main(int pipe_prnt[2], struct ntpd_conf *conf)
if (p->next > 0 && p->next <= time(NULL))
client_query(p);
- if (p->deadline > 0 && p->deadline <= time(NULL)) {
+ if (p->deadline > 0 && p->deadline < nextaction)
+ nextaction = p->deadline;
+ if (p->deadline > 0 && p->deadline <= time(NULL)) {
log_debug("no reply from %s received in time",
log_sockaddr((struct sockaddr *)&p->ss));
if (p->trustlevel >= TRUSTLEVEL_BADPEER &&