From 076aa51fc9f9a14b90a0dea4ecbb9278976599f1 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Thu, 22 Sep 2011 17:59:17 +0200 Subject: [PATCH] Easier to understand test for soft dependencies in dependencies_satisfied. --- src/libstrongswan/plugins/plugin_loader.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/libstrongswan/plugins/plugin_loader.c b/src/libstrongswan/plugins/plugin_loader.c index ecd1d718f..462ba7047 100644 --- a/src/libstrongswan/plugins/plugin_loader.c +++ b/src/libstrongswan/plugins/plugin_loader.c @@ -231,7 +231,6 @@ static bool feature_loaded(private_plugin_loader_t *this, plugin_entry_t *entry, /** * Check if dependencies are satisfied */ - static bool dependencies_satisfied(private_plugin_loader_t *this, char *name, bool soft, bool report, plugin_feature_t *features, int count) { @@ -266,7 +265,7 @@ static bool dependencies_satisfied(private_plugin_loader_t *this, char *name, } entries->destroy(entries); - if (!found && !(features[i].kind == FEATURE_SDEPEND && !soft)) + if (!found && (features[i].kind != FEATURE_SDEPEND || soft)) { if (report) {