diff options
| author | Martin Willi <martin@revosec.ch> | 2011-10-14 10:01:11 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2011-10-14 10:05:49 +0200 |
| commit | 58fcdc4f067f6870b883b3e427982e85ec759a1a (patch) | |
| tree | cf37f625b56bd665184d8aaa91a6534a29ffa3d4 /src | |
| parent | 67c1d3655495f32841729a6d100d508ae9df2716 (diff) | |
| download | strongswan-58fcdc4f067f6870b883b3e427982e85ec759a1a.tar.bz2 strongswan-58fcdc4f067f6870b883b3e427982e85ec759a1a.tar.xz | |
Don't enforce features with soft dependencies before all plugins are loaded
Diffstat (limited to 'src')
| -rw-r--r-- | src/libstrongswan/plugins/plugin_loader.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libstrongswan/plugins/plugin_loader.c b/src/libstrongswan/plugins/plugin_loader.c index 006a1b750..a8f7a64fd 100644 --- a/src/libstrongswan/plugins/plugin_loader.c +++ b/src/libstrongswan/plugins/plugin_loader.c @@ -503,14 +503,14 @@ METHOD(plugin_loader_t, load_plugins, bool, { /* try load new features until we don't get new ones */ } - while (load_features(this, FALSE, FALSE)) - { - /* second round, ignoring soft dependencies */ - } } enumerator->destroy(enumerator); if (!critical_failed) { + while (load_features(this, FALSE, FALSE)) + { + /* enforce loading features, ignoring soft dependencies */ + } /* report missing dependencies */ load_features(this, FALSE, TRUE); /* unload plugins that we were not able to load any features for */ |