diff options
| author | Yves-Alexis Perez <corsac@debian.org> | 2013-11-01 13:32:07 +0100 |
|---|---|---|
| committer | Yves-Alexis Perez <corsac@debian.org> | 2013-11-01 13:32:07 +0100 |
| commit | 5313d2d78ca150515f7f5eb39801c100690b6b29 (patch) | |
| tree | c78e420367283bb1b16f14210b12687cdfbd26eb /src/conftest/conftest.c | |
| parent | 6b99c8d9cff7b3e8ae8f3204b99e7ea40f791349 (diff) | |
| download | vyos-strongswan-5313d2d78ca150515f7f5eb39801c100690b6b29.tar.gz vyos-strongswan-5313d2d78ca150515f7f5eb39801c100690b6b29.zip | |
Imported Upstream version 5.1.1
Diffstat (limited to 'src/conftest/conftest.c')
| -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)) { |