From: Martin Willi <martin@revosec.ch>
Date: Mon, 10 Oct 2011 12:14:52 +0000 (+0200)
Subject: Load features after each plugin loaded until all plugins have feature support
X-Git-Tag: 4.6.0~165
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2feed2f3feb6c03be9a915e79887089189641caa;p=thirdparty%2Fstrongswan.git

Load features after each plugin loaded until all plugins have feature support
---

diff --git a/src/libstrongswan/plugins/plugin_loader.c b/src/libstrongswan/plugins/plugin_loader.c
index 39bea23e6d..bf57dc12c2 100644
--- a/src/libstrongswan/plugins/plugin_loader.c
+++ b/src/libstrongswan/plugins/plugin_loader.c
@@ -471,10 +471,9 @@ METHOD(plugin_loader_t, load_plugins, bool,
 			DBG1(DBG_LIB, "loading critical plugin '%s' failed", token);
 		}
 		free(token);
-	}
-	enumerator->destroy(enumerator);
-	if (!critical_failed)
-	{
+		/* TODO: we currently load features after each plugin is loaded. This
+		 * will not be necessary once we have features support in all plugins.
+		 */
 		while (load_features(this, TRUE, FALSE))
 		{
 			/* try load new features until we don't get new ones */
@@ -483,6 +482,10 @@ METHOD(plugin_loader_t, load_plugins, bool,
 		{
 			/* second round, ignoring soft dependencies */
 		}
+	}
+	enumerator->destroy(enumerator);
+	if (!critical_failed)
+	{
 		/* report missing dependencies */
 		load_features(this, FALSE, TRUE);
 		/* unload plugins that we were not able to load any features for */