diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2011-09-22 17:59:17 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2011-10-14 10:05:46 +0200 |
| commit | 076aa51fc9f9a14b90a0dea4ecbb9278976599f1 (patch) | |
| tree | aa9ed0189042a7ef04cf43c043a22483b1dee8fb /src/libstrongswan/plugins/plugin_loader.c | |
| parent | d29d63c2cb0bfffb8c427da618d2b304a01b6a88 (diff) | |
| download | strongswan-076aa51fc9f9a14b90a0dea4ecbb9278976599f1.tar.bz2 strongswan-076aa51fc9f9a14b90a0dea4ecbb9278976599f1.tar.xz | |
Easier to understand test for soft dependencies in dependencies_satisfied.
Diffstat (limited to 'src/libstrongswan/plugins/plugin_loader.c')
| -rw-r--r-- | src/libstrongswan/plugins/plugin_loader.c | 3 |
1 files changed, 1 insertions, 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) { |