diff options
| author | Hans-Joerg Hoexer <hshoexer@cvs.openbsd.org> | 2004-04-08 10:05:55 +0000 |
|---|---|---|
| committer | Hans-Joerg Hoexer <hshoexer@cvs.openbsd.org> | 2004-04-08 10:05:55 +0000 |
| commit | 319bda2ef300d31378d49befee97a7434938df4c (patch) | |
| tree | ecad033c77bdade09fdef3886f27383b7c4ba413 /sbin | |
| parent | 371dd3432c0c49742443e6d7d66492616df18498 (diff) | |
Set timezone before privsep, child uses now correct timezone.
Noticed by david@
ok ho@ david@
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/isakmpd/init.c | 7 | ||||
| -rw-r--r-- | sbin/isakmpd/isakmpd.c | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/sbin/isakmpd/init.c b/sbin/isakmpd/init.c index 5e9e755e6b2..dcf1c69122a 100644 --- a/sbin/isakmpd/init.c +++ b/sbin/isakmpd/init.c @@ -1,4 +1,4 @@ -/* $OpenBSD: init.c,v 1.27 2004/02/25 16:01:28 hshoexer Exp $ */ +/* $OpenBSD: init.c,v 1.28 2004/04/08 10:05:54 hshoexer Exp $ */ /* $EOM: init.c,v 1.25 2000/03/30 14:27:24 ho Exp $ */ /* @@ -69,8 +69,6 @@ init (void) isakmp_doi_init (); libcrypto_init (); - tzset (); - timer_init (); /* The following group are depending on timer_init having run. */ @@ -118,9 +116,6 @@ reinit (void) log_reinit (); - /* Set timezone */ - tzset (); - #ifdef USE_POLICY /* Reread the policies. */ policy_init (); diff --git a/sbin/isakmpd/isakmpd.c b/sbin/isakmpd/isakmpd.c index 12ae94e2ed0..3130491da1e 100644 --- a/sbin/isakmpd/isakmpd.c +++ b/sbin/isakmpd/isakmpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isakmpd.c,v 1.59 2004/03/31 10:47:16 ho Exp $ */ +/* $OpenBSD: isakmpd.c,v 1.60 2004/04/08 10:05:54 hshoexer Exp $ */ /* $EOM: isakmpd.c,v 1.54 2000/10/05 09:28:22 niklas Exp $ */ /* @@ -39,6 +39,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <time.h> #include <unistd.h> #include <fcntl.h> @@ -397,6 +398,9 @@ main (int argc, char *argv[]) if (daemon (0, 0)) log_fatal ("main: daemon (0, 0) failed"); + /* Set timezone before priv'separation */ + tzset(); + #if defined (USE_PRIVSEP) if (monitor_init ()) { |