aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2015-03-19 16:19:24 +0100
committerTobias Brunner <tobias@strongswan.org>2015-03-19 18:37:24 +0100
commitd2f4345b0361d57e54e7cdd3ae2abfba20429f1f (patch)
tree3a59137915f4b0a1eb3234eacaa029311e45dd41 /src
parent945fdeb9187025b50c81437c1835f886cf96581f (diff)
downloadstrongswan-d2f4345b0361d57e54e7cdd3ae2abfba20429f1f.tar.bz2
strongswan-d2f4345b0361d57e54e7cdd3ae2abfba20429f1f.tar.xz
charon-systemd: Optionally load plugin list from charon-systemd.load
Diffstat (limited to 'src')
-rw-r--r--src/charon-systemd/charon-systemd.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/charon-systemd/charon-systemd.c b/src/charon-systemd/charon-systemd.c
index d9ceca74a..e391a5397 100644
--- a/src/charon-systemd/charon-systemd.c
+++ b/src/charon-systemd/charon-systemd.c
@@ -378,7 +378,8 @@ int main(int argc, char *argv[])
lib->plugins->add_static_features(lib->plugins, lib->ns, features,
countof(features), TRUE, journal_reload, &journal);
- if (!charon->initialize(charon, PLUGINS))
+ if (!charon->initialize(charon,
+ lib->settings->get_str(lib->settings, "%s.load", PLUGINS, lib->ns)))
{
sd_notifyf(0, "STATUS=charon initialization failed");
return SS_RC_INITIALIZATION_FAILED;