diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2012-04-19 13:32:51 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2012-05-03 13:14:07 +0200 |
| commit | 94b48e071a6014390fd554f186ce2a2a1bb2464a (patch) | |
| tree | da9ba3cea1e834187e3f640f0e3583b378d92b39 /src/libcharon/daemon.c | |
| parent | 2ee11fd42d78f05140404864f3ce25b2608d2102 (diff) | |
| download | strongswan-94b48e071a6014390fd554f186ce2a2a1bb2464a.tar.bz2 strongswan-94b48e071a6014390fd554f186ce2a2a1bb2464a.tar.xz | |
Provide plugin list from charon, not internally in libcharon.
Diffstat (limited to 'src/libcharon/daemon.c')
| -rw-r--r-- | src/libcharon/daemon.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/src/libcharon/daemon.c b/src/libcharon/daemon.c index ee2db3318..c6238ebab 100644 --- a/src/libcharon/daemon.c +++ b/src/libcharon/daemon.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2010 Tobias Brunner + * Copyright (C) 2006-2012 Tobias Brunner * Copyright (C) 2005-2009 Martin Willi * Copyright (C) 2006 Daniel Roethlisberger * Copyright (C) 2005 Jan Hutter @@ -207,22 +207,10 @@ METHOD(daemon_t, start, void, } METHOD(daemon_t, initialize, bool, - private_daemon_t *this) + private_daemon_t *this, char *plugins) { - DBG1(DBG_DMN, "Starting IKEv2 charon daemon (strongSwan "VERSION")"); - - if (lib->integrity) - { - DBG1(DBG_DMN, "integrity tests enabled:"); - DBG1(DBG_DMN, "lib 'libstrongswan': passed file and segment integrity tests"); - DBG1(DBG_DMN, "lib 'libhydra': passed file and segment integrity tests"); - DBG1(DBG_DMN, "lib 'libcharon': passed file and segment integrity tests"); - DBG1(DBG_DMN, "daemon 'charon': passed file integrity test"); - } - /* load plugins, further infrastructure may need it */ - if (!lib->plugins->load(lib->plugins, NULL, - lib->settings->get_str(lib->settings, "charon.load", PLUGINS))) + if (!lib->plugins->load(lib->plugins, NULL, plugins)) { return FALSE; } |