From 58fcdc4f067f6870b883b3e427982e85ec759a1a Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Fri, 14 Oct 2011 10:01:11 +0200 Subject: [PATCH] Don't enforce features with soft dependencies before all plugins are loaded --- src/libstrongswan/plugins/plugin_loader.c | 8 ++++---- 1 file 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 */