diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-01-31 08:19:06 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-01-31 08:19:06 +0000 |
| commit | 5af6067e1c935637c6e9e2da7251f9665d833717 (patch) | |
| tree | 11d04ca541a99da105b17f9bf1f61a7966fd8f9b /sbin/isakmpd | |
| parent | 4cf8e12df76e89941127c68b948565b379a04d26 (diff) | |
Merge with EOM 1.21
author: angelos
Remove empty line.
author: angelos
Change the order of initializing x509 and policy (x509 depends on policy).
Diffstat (limited to 'sbin/isakmpd')
| -rw-r--r-- | sbin/isakmpd/init.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sbin/isakmpd/init.c b/sbin/isakmpd/init.c index b551ed75db0..d81dc4446c1 100644 --- a/sbin/isakmpd/init.c +++ b/sbin/isakmpd/init.c @@ -1,5 +1,5 @@ -/* $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 $ */ +/* $OpenBSD: init.c,v 1.12 2000/01/31 08:19:05 niklas Exp $ */ +/* $EOM: init.c,v 1.21 2000/01/31 05:28:50 angelos Exp $ */ /* * Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved. @@ -80,16 +80,16 @@ init () connection_init (); cookie_init (); - /* Depends on conf_init having run */ +#if defined (USE_KEYNOTE) || defined (HAVE_DLOPEN) + /* policy_init depends on conf_init having run. */ + policy_init (); +#endif + + /* Depends on conf_init and policy_init having run */ cert_init (); sa_init (); transport_init (); udp_init (); ui_init (); - -#if defined (USE_KEYNOTE) || defined (HAVE_DLOPEN) - /* policy_init depends on conf_init having run. */ - policy_init (); -#endif } |