summaryrefslogtreecommitdiff
path: root/usr.sbin/timed
diff options
context:
space:
mode:
authorAaron Campbell <aaron@cvs.openbsd.org>2005-02-17 12:33:31 +0000
committerAaron Campbell <aaron@cvs.openbsd.org>2005-02-17 12:33:31 +0000
commitbe8b6236cc1739d09755fdf0da2ced5a173f78e8 (patch)
tree7e9c0f888741aba0a87e722d7494671d8526cfd1 /usr.sbin/timed
parentb4dddfd2b8f8ca956b17810d00c6d3c77da897fb (diff)
Fix scoping error where ignored nets could transition to the NOMASTER state
erroneously. henning@, otto@ ok
Diffstat (limited to 'usr.sbin/timed')
-rw-r--r--usr.sbin/timed/timed/timed.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.sbin/timed/timed/timed.c b/usr.sbin/timed/timed/timed.c
index 64aea039d62..c11cb7161c3 100644
--- a/usr.sbin/timed/timed/timed.c
+++ b/usr.sbin/timed/timed/timed.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: timed.c,v 1.24 2003/11/04 14:06:15 jmc Exp $ */
+/* $OpenBSD: timed.c,v 1.25 2005/02/17 12:33:30 aaron Exp $ */
/*-
* Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -408,9 +408,10 @@ main(int argc, char **argv)
justquit = 1;
}
for (ntp = nettab; ntp != NULL; ntp = ntp->next) {
- if (ntp->status == MASTER)
+ if (ntp->status == MASTER) {
rmnetmachs(ntp);
ntp->status = NOMASTER;
+ }
}
checkignorednets();
pickslavenet(0);