diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-01-26 15:21:09 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-01-26 15:21:09 +0000 |
| commit | 986bc069204b7d3e2f6fd8bdfae370307ae03f30 (patch) | |
| tree | e78087c4946be623b04a706e0f8bc763a8daef33 /sbin | |
| parent | 56a98ebf1a14b74cb4e90f208c17583ef482fa65 (diff) | |
isakmpd.c: Merge with EOM 1.39
init.c: Merge with EOM 1.19
author: angelos
GMTTimeOfDay and LocalTimeOfDay attributes, comment in x509.c.
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/isakmpd/init.c | 7 | ||||
| -rw-r--r-- | sbin/isakmpd/isakmpd.c | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/sbin/isakmpd/init.c b/sbin/isakmpd/init.c index 5f29c874257..b551ed75db0 100644 --- a/sbin/isakmpd/init.c +++ b/sbin/isakmpd/init.c @@ -1,5 +1,5 @@ -/* $OpenBSD: init.c,v 1.10 1999/08/26 22:30:58 niklas Exp $ */ -/* $EOM: init.c,v 1.18 1999/08/26 11:21:49 niklas Exp $ */ +/* $OpenBSD: init.c,v 1.11 2000/01/26 15:21:08 niklas Exp $ */ +/* $EOM: init.c,v 1.19 1999/10/10 22:48:36 angelos Exp $ */ /* * Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved. @@ -70,6 +70,9 @@ init () ipsec_init (); isakmp_doi_init (); libcrypto_init (); + + tzset (); + timer_init (); /* The following group are depending on timer_init having run. */ diff --git a/sbin/isakmpd/isakmpd.c b/sbin/isakmpd/isakmpd.c index fda2a8ecce0..d2e36b0a9e8 100644 --- a/sbin/isakmpd/isakmpd.c +++ b/sbin/isakmpd/isakmpd.c @@ -1,5 +1,5 @@ -/* $OpenBSD: isakmpd.c,v 1.15 1999/10/01 14:09:20 niklas Exp $ */ -/* $EOM: isakmpd.c,v 1.38 1999/09/20 19:57:50 angelos Exp $ */ +/* $OpenBSD: isakmpd.c,v 1.16 2000/01/26 15:21:08 niklas Exp $ */ +/* $EOM: isakmpd.c,v 1.39 1999/10/10 22:48:36 angelos Exp $ */ /* * Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved. @@ -177,6 +177,9 @@ reinit (void) /* Reread config file. */ conf_reinit (); + /* Set timezone */ + tzset (); + #if defined (USE_KEYNOTE) || defined (HAVE_DLOPEN) /* Reread the policies. */ policy_init (); |