summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorReyk Floeter <reyk@cvs.openbsd.org>2015-05-21 14:24:44 +0000
committerReyk Floeter <reyk@cvs.openbsd.org>2015-05-21 14:24:44 +0000
commit050ab7e2f2b681dc678b6347bc825f7586d2cbe7 (patch)
tree283f9bfce37c15263f4f2d640e2ba37cdedb97bb /usr.sbin
parent750f1f5b14cf27229ea0fa2dc0dd16b35bc8be19 (diff)
No need to call tzset() and log_init() in the forked constraint
handler. It is run in a chroot, so tzset() wouldn't even succeed to open the zone file. Found with tame. OK deraadt@
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/ntpd/constraint.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/usr.sbin/ntpd/constraint.c b/usr.sbin/ntpd/constraint.c
index 25a4fa70801..2e48cf7f610 100644
--- a/usr.sbin/ntpd/constraint.c
+++ b/usr.sbin/ntpd/constraint.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: constraint.c,v 1.10 2015/05/18 14:19:23 reyk Exp $ */
+/* $OpenBSD: constraint.c,v 1.11 2015/05/21 14:24:43 reyk Exp $ */
/*
* Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org>
@@ -195,9 +195,6 @@ constraint_query(struct constraint *cstr)
close(pipes[1]);
return (-1);
case 0:
- tzset();
- log_init(conf->debug);
-
setproctitle("constraint from %s", hname);
/* Child process */