diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-03-31 20:30:12 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-03-31 20:30:12 +0000 |
| commit | c6b184d33fea2894eb519692af2a03705a648831 (patch) | |
| tree | 60189f729727127082ae77150605975fd20bfec6 /sbin/isakmpd/init.c | |
| parent | 76fd5584c432be03e13879feee3fe406b70405be (diff) | |
Merge with EOM 1.12
do conf.c init after timer.c
Diffstat (limited to 'sbin/isakmpd/init.c')
| -rw-r--r-- | sbin/isakmpd/init.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sbin/isakmpd/init.c b/sbin/isakmpd/init.c index dc497a734cf..ec25d5ce110 100644 --- a/sbin/isakmpd/init.c +++ b/sbin/isakmpd/init.c @@ -1,5 +1,5 @@ -/* $OpenBSD: init.c,v 1.4 1999/02/26 03:43:00 niklas Exp $ */ -/* $EOM: init.c,v 1.11 1999/02/25 11:39:06 niklas Exp $ */ +/* $OpenBSD: init.c,v 1.5 1999/03/31 20:30:11 niklas Exp $ */ +/* $EOM: init.c,v 1.12 1999/03/31 20:25:25 niklas Exp $ */ /* * Copyright (c) 1998 Niklas Hallqvist. All rights reserved. @@ -57,14 +57,17 @@ void init () { app_init (); - conf_init (); doi_init (); exchange_init (); group_init (); ipsec_init (); isakmp_doi_init (); timer_init (); - cookie_init (); /* Depends on properly setup timer queue */ + + /* The following group are depending on timer_init having run. */ + conf_init (); + cookie_init (); + sa_init (); transport_init (); udp_init (); |