From f14bf6345fff3139fde71c3864184746eaf89499 Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Wed, 29 Feb 2012 16:07:16 +0100 Subject: [PATCH] Don't depend on a feature that has a dependency to the same feauture during unload --- src/libstrongswan/plugins/plugin_loader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libstrongswan/plugins/plugin_loader.c b/src/libstrongswan/plugins/plugin_loader.c index 164b68e60..94ef00b2e 100644 --- a/src/libstrongswan/plugins/plugin_loader.c +++ b/src/libstrongswan/plugins/plugin_loader.c @@ -361,7 +361,8 @@ static bool dependency_required(private_plugin_loader_t *this, count = entry->plugin->get_features(entry->plugin, &features); for (i = 0; i < count; i++) { - if (feature_loaded(this, entry, &features[i])) + if (&features[i] != dep && + feature_loaded(this, entry, &features[i])) { while (++i < count && (features[i].kind == FEATURE_DEPENDS || features[i].kind == FEATURE_SDEPEND))