From: Martin Willi <martin@revosec.ch>
Date: Tue, 23 Nov 2010 09:50:36 +0000 (+0100)
Subject: Moved generic infrastructure initialization to libcharon_init(), allows us to preload... 
X-Git-Tag: 4.5.1~265
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=401818651e76404eb57d825681e821f84f8faeda;p=thirdparty%2Fstrongswan.git

Moved generic infrastructure initialization to libcharon_init(), allows us to preload plugins
---

diff --git a/src/libcharon/daemon.c b/src/libcharon/daemon.c
index b8b7d88907..2e708745ce 100644
--- a/src/libcharon/daemon.c
+++ b/src/libcharon/daemon.c
@@ -210,16 +210,6 @@ METHOD(daemon_t, initialize, bool,
 		DBG1(DBG_DMN, "daemon 'charon': passed file integrity test");
 	}
 
-	/* load secrets, ca certificates and crls */
-	this->public.controller = controller_create();
-	this->public.eap = eap_manager_create();
-	this->public.sim = sim_manager_create();
-	this->public.tnccs = tnccs_manager_create();
-	this->public.backends = backend_manager_create();
-	this->public.socket = socket_manager_create();
-	this->public.traps = trap_manager_create();
-	this->kernel_handler = kernel_handler_create();
-
 	/* load plugins, further infrastructure may need it */
 	if (!lib->plugins->load(lib->plugins, NULL,
 			lib->settings->get_str(lib->settings, "charon.load", PLUGINS)))
@@ -271,6 +261,15 @@ private_daemon_t *daemon_create()
 			.sys_loggers = linked_list_create(),
 		},
 	);
+	charon = &this->public;
+	this->public.controller = controller_create();
+	this->public.eap = eap_manager_create();
+	this->public.sim = sim_manager_create();
+	this->public.tnccs = tnccs_manager_create();
+	this->public.backends = backend_manager_create();
+	this->public.socket = socket_manager_create();
+	this->public.traps = trap_manager_create();
+	this->kernel_handler = kernel_handler_create();
 
 #ifdef CAPABILITIES
 #ifdef CAPABILITIES_LIBCAP
@@ -303,7 +302,6 @@ bool libcharon_init()
 	private_daemon_t *this;
 
 	this = daemon_create();
-	charon = &this->public;
 
 	/* for uncritical pseudo random numbers */
 	srandom(time(NULL) + getpid());