diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2013-09-03 19:02:40 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2013-09-13 11:44:04 +0200 |
| commit | 11ac36b016a12c1d9d4fc1a1e0e2bf450566cae7 (patch) | |
| tree | 6d97f65fb268e6b4dd91b4dc6907b47ed18cc229 /src | |
| parent | fafa7684787ccfb91774deae9f38f3a75f662b17 (diff) | |
| download | strongswan-11ac36b016a12c1d9d4fc1a1e0e2bf450566cae7.tar.bz2 strongswan-11ac36b016a12c1d9d4fc1a1e0e2bf450566cae7.tar.xz | |
conftest: Don't load plugins incrementally
This is not supported by the plugin loader, so we simply combine the
plugin lists and load them all at once.
Diffstat (limited to 'src')
| -rw-r--r-- | src/conftest/conftest.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/conftest/conftest.c b/src/conftest/conftest.c index 8d2060c66..faf9df91f 100644 --- a/src/conftest/conftest.c +++ b/src/conftest/conftest.c @@ -432,7 +432,7 @@ int main(int argc, char *argv[]) int status = 0; sigset_t set; int sig; - char *suite_file = "suite.conf", *test_file = NULL; + char *suite_file = "suite.conf", *test_file = NULL, *preload, *plugins; file_logger_t *logger; if (!library_init(NULL)) @@ -509,16 +509,18 @@ int main(int argc, char *argv[]) } load_loggers(logger); - if (!lib->plugins->load(lib->plugins, - conftest->test->get_str(conftest->test, "preload", ""))) + preload = conftest->test->get_str(conftest->test, "preload", ""); + if (asprintf(&plugins, "%s %s", preload, PLUGINS) < 0) { return 1; } - if (!charon->initialize(charon, PLUGINS)) + if (!charon->initialize(charon, plugins)) { + free(plugins); return 1; } lib->plugins->status(lib->plugins, LEVEL_CTRL); + free(plugins); if (!load_certs(conftest->test, conftest->suite_dir)) { |