plugin-loader: Removed unused path argument of load() method

Multiple additional search paths can be added with the add_path()
method.

diff --git a/scripts/crypt_burn.c b/scripts/crypt_burn.c
index 9633568cd5216df04384bc57f48b944bf908731a..8101f9cbd03fd70b08fe462ad84aea46c71785c2 100644 (file)
--- a/scripts/crypt_burn.c
+++ b/scripts/crypt_burn.c
@@ -27,7 +27,7 @@ int main(int argc, char *argv[])
 
 
        library_init(NULL);
-       lib->plugins->load(lib->plugins, NULL, PLUGINS);
+       lib->plugins->load(lib->plugins, PLUGINS);
        atexit(library_deinit);
 
        printf("loaded: %s\n", PLUGINS);

diff --git a/scripts/dh_speed.c b/scripts/dh_speed.c
index 588807597cf6a429eceac64701e709c5cd0b84b4..dc0a2870f207352effb8c85ddf4db9ea28b52e75 100644 (file)
--- a/scripts/dh_speed.c
+++ b/scripts/dh_speed.c
@@ -119,7 +119,7 @@ int main(int argc, char *argv[])
        }
 
        library_init(NULL);
-       lib->plugins->load(lib->plugins, NULL, argv[1]);
+       lib->plugins->load(lib->plugins, argv[1]);
        atexit(library_deinit);
 
        rounds = atoi(argv[2]);

diff --git a/scripts/dnssec.c b/scripts/dnssec.c
index 315a14618edcbb97bd191da9f05f8fc60693d217..0cddfc47e5b98338abf1fed09b6126ddaf7ccb67 100644 (file)
--- a/scripts/dnssec.c
+++ b/scripts/dnssec.c
@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
 
        dbg = dbg_dnssec;
 
-       if (!lib->plugins->load(lib->plugins, NULL, PLUGINS))
+       if (!lib->plugins->load(lib->plugins, PLUGINS))
        {
                return 1;
        }

diff --git a/scripts/fetch.c b/scripts/fetch.c
index 23f8572468eb388efc5b74ffc3dc29d8daecdd06..f58b37f89b1f9a44fdf58c365345349bf86a3683 100644 (file)
--- a/scripts/fetch.c
+++ b/scripts/fetch.c
@@ -37,7 +37,7 @@ int main(int argc, char *argv[])
 
        library_init(NULL);
        atexit(library_deinit);
-       lib->plugins->load(lib->plugins, NULL, PLUGINS);
+       lib->plugins->load(lib->plugins, PLUGINS);
 
        if (argc != 3 || (!streq(argv[1], "a") && !streq(argv[1], "s")))
        {

diff --git a/scripts/hash_burn.c b/scripts/hash_burn.c
index e616d6d5a94989b01b6daf6f4fc7d303241bd731..20e5642d414d1ddbabae0f603422e7a42da8433d 100644 (file)
--- a/scripts/hash_burn.c
+++ b/scripts/hash_burn.c
@@ -26,7 +26,7 @@ int main(int argc, char *argv[])
        int limit = 0, i = 0;
 
        library_init(NULL);
-       lib->plugins->load(lib->plugins, NULL, PLUGINS);
+       lib->plugins->load(lib->plugins, PLUGINS);
        atexit(library_deinit);
 
        printf("loaded: %s\n", PLUGINS);

diff --git a/scripts/key2keyid.c b/scripts/key2keyid.c
index aba96a8c1164073c196e7a5154335ba644921a3d..31f3bee82e8f2ff7742b5ee8c7df61dea7331e1c 100644 (file)
--- a/scripts/key2keyid.c
+++ b/scripts/key2keyid.c
@@ -31,7 +31,7 @@ int main(int argc, char *argv[])
        int read;
 
        library_init(NULL);
-       lib->plugins->load(lib->plugins, NULL, PLUGINS);
+       lib->plugins->load(lib->plugins, PLUGINS);
        atexit(library_deinit);
 
        read = fread(buf, 1, sizeof(buf), stdin);

diff --git a/scripts/keyid2sql.c b/scripts/keyid2sql.c
index 26427ab3d297460eb48a25e80409e6edb91281b8..6e9a1334eddb86cea08df3d0058600ae1d6b1088 100644 (file)
--- a/scripts/keyid2sql.c
+++ b/scripts/keyid2sql.c
@@ -31,7 +31,7 @@ int main(int argc, char *argv[])
        int read, n;
 
        library_init(NULL);
-       lib->plugins->load(lib->plugins, NULL, PLUGINS);
+       lib->plugins->load(lib->plugins, PLUGINS);
        atexit(library_deinit);
 
        read = fread(buf, 1, sizeof(buf), stdin);

diff --git a/scripts/pubkey_speed.c b/scripts/pubkey_speed.c
index 32c6e8f49c95cb22b977e942b67d26f862be6f61..ba3ad1f5e65acf57d96cde7e22ee49b4f9e9ee3e 100644 (file)
--- a/scripts/pubkey_speed.c
+++ b/scripts/pubkey_speed.c
@@ -58,7 +58,7 @@ int main(int argc, char *argv[])
        }
 
        library_init(NULL);
-       lib->plugins->load(lib->plugins, NULL, argv[1]);
+       lib->plugins->load(lib->plugins, argv[1]);
        atexit(library_deinit);
 
        keydata = chunk_create(buf, 0);

diff --git a/scripts/tls_test.c b/scripts/tls_test.c
index 332f13d89ac0235b8285472e45d5bbcdb573ad06..e1e8ca82b84472c14c0b2b8f895c0c18137cfa37 100644 (file)
--- a/scripts/tls_test.c
+++ b/scripts/tls_test.c
@@ -255,7 +255,7 @@ static void init()
 
        dbg = dbg_tls;
 
-       lib->plugins->load(lib->plugins, NULL, PLUGINS);
+       lib->plugins->load(lib->plugins, PLUGINS);
 
        creds = mem_cred_create();
        lib->credmgr->add_set(lib->credmgr, &creds->set);

diff --git a/src/conftest/conftest.c b/src/conftest/conftest.c
index 56d98bbe240e4de298166b9e191ce5dae9d9f400..8d2060c66358c5bc5b7484d7068599d6316a02fb 100644 (file)
--- a/src/conftest/conftest.c
+++ b/src/conftest/conftest.c
@@ -509,7 +509,7 @@ int main(int argc, char *argv[])
        }
        load_loggers(logger);
 
-       if (!lib->plugins->load(lib->plugins, NULL,
+       if (!lib->plugins->load(lib->plugins,
                        conftest->test->get_str(conftest->test, "preload", "")))
        {
                return 1;

diff --git a/src/libcharon/daemon.c b/src/libcharon/daemon.c
index 1ad80693a915087b83958d4fe8a98069f0c5dee4..5e3ae72b964ca584e156078ffa1e66bbbe798da1 100644 (file)
--- a/src/libcharon/daemon.c
+++ b/src/libcharon/daemon.c
@@ -529,7 +529,7 @@ METHOD(daemon_t, initialize, bool,
                                                                          countof(features), TRUE);
 
        /* load plugins, further infrastructure may need it */
-       if (!lib->plugins->load(lib->plugins, NULL, plugins))
+       if (!lib->plugins->load(lib->plugins, plugins))
        {
                return FALSE;
        }

diff --git a/src/libhydra/plugins/attr_sql/pool.c b/src/libhydra/plugins/attr_sql/pool.c
index 880af61dc679804fbe71bbe2c7d9203e4b05afbc..4e7c48e23757ae771d35478f6ecbb5da85118dc0 100644 (file)
--- a/src/libhydra/plugins/attr_sql/pool.c
+++ b/src/libhydra/plugins/attr_sql/pool.c
@@ -1260,7 +1260,7 @@ int main(int argc, char *argv[])
                fprintf(stderr, "integrity check of pool failed\n");
                exit(SS_RC_DAEMON_INTEGRITY);
        }
-       if (!lib->plugins->load(lib->plugins, NULL,
+       if (!lib->plugins->load(lib->plugins,
                        lib->settings->get_str(lib->settings, "pool.load", PLUGINS)))
        {
                exit(SS_RC_INITIALIZATION_FAILED);

diff --git a/src/libimcv/imcv.c b/src/libimcv/imcv.c
index de859011ce78e22c5782c98dd32bb13d9e570f7d..b52b81c42b9403d6198ae9da35bb8ff5624f7057 100644 (file)
--- a/src/libimcv/imcv.c
+++ b/src/libimcv/imcv.c
@@ -124,7 +124,7 @@ bool libimcv_init(bool is_imv)
                dbg = imcv_dbg;
                openlog("imcv", 0, LOG_DAEMON);
 
-               if (!lib->plugins->load(lib->plugins, NULL,
+               if (!lib->plugins->load(lib->plugins,
                                lib->settings->get_str(lib->settings, "libimcv.load",
                                        "random nonce gmp pubkey x509")))
                {

diff --git a/src/libimcv/imv/imv_policy_manager.c b/src/libimcv/imv/imv_policy_manager.c
index 7dc4c5c10b4324ce22ac671792ca09cb1e7b135d..f363964a56b37faf8b5168faa94d5be90716de3b 100644 (file)
--- a/src/libimcv/imv/imv_policy_manager.c
+++ b/src/libimcv/imv/imv_policy_manager.c
@@ -15,7 +15,7 @@
 
 #include "imv_policy_manager_usage.h"
 #include "imv_workitem.h"
- 
+
 #include <library.h>
 #include <utils/debug.h>
 
@@ -251,7 +251,7 @@ int main(int argc, char *argv[])
        {
                exit(SS_RC_LIBSTRONGSWAN_INTEGRITY);
        }
-       if (!lib->plugins->load(lib->plugins, NULL, 
+       if (!lib->plugins->load(lib->plugins,
                        lib->settings->get_str(lib->settings, "imv_policy_manager.load",
                                 "sqlite")))
        {
@@ -285,7 +285,7 @@ int main(int argc, char *argv[])
                exit(SS_RC_INITIALIZATION_FAILED);
        }
        session_id = atoi(tnc_session_id);
-       
+
        /* attach IMV database */
        uri = lib->settings->get_str(lib->settings, "libimcv.database", NULL);
        if (!uri)

diff --git a/src/libimcv/plugins/imv_os/pacman.c b/src/libimcv/plugins/imv_os/pacman.c
index 6e4bc1103618f45cb33182e01a6b77574958470f..57cc62a0856f965e1f01ffa8e7f241674152c11f 100644 (file)
--- a/src/libimcv/plugins/imv_os/pacman.c
+++ b/src/libimcv/plugins/imv_os/pacman.c
@@ -470,7 +470,7 @@ int main(int argc, char *argv[])
        {
                exit(SS_RC_LIBSTRONGSWAN_INTEGRITY);
        }
-       if (!lib->plugins->load(lib->plugins, NULL,
+       if (!lib->plugins->load(lib->plugins,
                        lib->settings->get_str(lib->settings, "attest.load", "sqlite")))
        {
                exit(SS_RC_INITIALIZATION_FAILED);

diff --git a/src/libpts/plugins/imv_attestation/attest.c b/src/libpts/plugins/imv_attestation/attest.c
index 6cefb212404587b6a1002072124fc2e819d26b4a..4d25df3f40655549c915f61b38c3dc392f58132f 100644 (file)
--- a/src/libpts/plugins/imv_attestation/attest.c
+++ b/src/libpts/plugins/imv_attestation/attest.c
@@ -443,7 +443,7 @@ int main(int argc, char *argv[])
        {
                exit(SS_RC_LIBSTRONGSWAN_INTEGRITY);
        }
-       if (!lib->plugins->load(lib->plugins, NULL,
+       if (!lib->plugins->load(lib->plugins,
                        lib->settings->get_str(lib->settings, "attest.load", PLUGINS)))
        {
                exit(SS_RC_INITIALIZATION_FAILED);

diff --git a/src/libstrongswan/plugins/plugin_loader.c b/src/libstrongswan/plugins/plugin_loader.c
index 025e97adbc07ee36608edb536d7d53290df1bab3..5ed0a9b0f5c2ce2339dace28fd273ef545b15e07 100644 (file)
--- a/src/libstrongswan/plugins/plugin_loader.c
+++ b/src/libstrongswan/plugins/plugin_loader.c
@@ -937,17 +937,14 @@ static bool find_plugin(char *path, char *name, char *buf, char **file)
 }
 
 METHOD(plugin_loader_t, load_plugins, bool,
-       private_plugin_loader_t *this, char *default_path, char *list)
+       private_plugin_loader_t *this, char *list)
 {
        enumerator_t *enumerator;
-       char *token;
+       char *default_path = NULL, *token;
        bool critical_failed = FALSE;
 
 #ifdef PLUGINDIR
-       if (default_path == NULL)
-       {
-               default_path = PLUGINDIR;
-       }
+       default_path = PLUGINDIR;
 #endif /* PLUGINDIR */
 
        enumerator = enumerator_create_token(list, " ", " ");

diff --git a/src/libstrongswan/plugins/plugin_loader.h b/src/libstrongswan/plugins/plugin_loader.h
index 15496f4c7f1ea6264eef176ea362e5e96c785136..285b339102a52cbb535cf9023c867bed280441fd 100644 (file)
--- a/src/libstrongswan/plugins/plugin_loader.h
+++ b/src/libstrongswan/plugins/plugin_loader.h
@@ -57,25 +57,24 @@ struct plugin_loader_t {
                                                                 bool critical);
 
        /**
-        * Load a list of plugins from a directory.
+        * Load a list of plugins.
         *
-        * Each plugin in list may have a ending exclamation mark (!) to mark it
+        * Each plugin in list may have an ending exclamation mark (!) to mark it
         * as a critical plugin. If loading a critical plugin fails, plugin loading
         * is aborted and FALSE is returned.
         *
         * Additional paths can be added with add_path(), these will be searched
-        * for the plugins first, in the order they were added, then the given path
-        * or the default follow.
+        * for the plugins first, in the order they were added, then the default
+        * path follows.
         *
         * @note Even though this method could be called multiple times this is
         * currently not really supported in regards to plugin features and their
         * dependencies (in particular soft dependencies).
         *
-        * @param path                  path containing loadable plugins, NULL for default
         * @param list                  space separated list of plugins to load
         * @return                              TRUE if all critical plugins loaded successfully
         */
-       bool (*load)(plugin_loader_t *this, char *path, char *list);
+       bool (*load)(plugin_loader_t *this, char *list);
 
        /**
         * Add an additional search path for plugins.

diff --git a/src/libstrongswan/tests/test_runner.c b/src/libstrongswan/tests/test_runner.c
index 85c6b2019a0abee9accb8358ad9dc69e42d10380..2f9e4dc0ab85121a968596a3d621b59183fd8545 100644 (file)
--- a/src/libstrongswan/tests/test_runner.c
+++ b/src/libstrongswan/tests/test_runner.c
@@ -40,7 +40,7 @@ static bool load_plugins()
        }
        enumerator->destroy(enumerator);
 
-       return lib->plugins->load(lib->plugins, NULL, PLUGINS);
+       return lib->plugins->load(lib->plugins, PLUGINS);
 }
 
 int main()

diff --git a/src/manager/main.c b/src/manager/main.c
index 15ed38154a170cec0a68d596562c018d4634ff9d..66a4384ccf85ea7ea4e877704634a43cdf7200e6 100644 (file)
--- a/src/manager/main.c
+++ b/src/manager/main.c
@@ -35,7 +35,7 @@ int main (int arc, char *argv[])
        int threads, timeout;
 
        library_init(NULL);
-       if (!lib->plugins->load(lib->plugins, NULL,
+       if (!lib->plugins->load(lib->plugins,
                        lib->settings->get_str(lib->settings, "manager.load", PLUGINS)))
        {
                return 1;

diff --git a/src/medsrv/main.c b/src/medsrv/main.c
index 03b1352890da75d2144b3abdd0b55510600ee851..cbba728722f313f3670880f2b564ed475151fe80 100644 (file)
--- a/src/medsrv/main.c
+++ b/src/medsrv/main.c
@@ -34,7 +34,7 @@ int main(int arc, char *argv[])
        int timeout, threads;
 
        library_init(NULL);
-       if (!lib->plugins->load(lib->plugins, NULL,
+       if (!lib->plugins->load(lib->plugins,
                        lib->settings->get_str(lib->settings, "medsrv.load", PLUGINS)))
        {
                return 1;

diff --git a/src/openac/openac.c b/src/openac/openac.c
index 7b81d6ceadf2baf55bed59c2362c840ce6cbb077..7074d44bec0a8e542c15dc9ae9b6227233880f5e 100644 (file)
--- a/src/openac/openac.c
+++ b/src/openac/openac.c
@@ -238,7 +238,7 @@ int main(int argc, char **argv)
                fprintf(stderr, "integrity check of openac failed\n");
                exit(SS_RC_DAEMON_INTEGRITY);
        }
-       if (!lib->plugins->load(lib->plugins, NULL,
+       if (!lib->plugins->load(lib->plugins,
                        lib->settings->get_str(lib->settings, "openac.load", PLUGINS)))
        {
                exit(SS_RC_INITIALIZATION_FAILED);

diff --git a/src/pki/pki.c b/src/pki/pki.c
index 429517b9259a84a585bcb2eb3e130a19cdda5445..c3039a649139a3aa05b051fa7c72b6e53d588fb1 100644 (file)
--- a/src/pki/pki.c
+++ b/src/pki/pki.c
@@ -167,7 +167,7 @@ int main(int argc, char *argv[])
                fprintf(stderr, "integrity check of pki failed\n");
                exit(SS_RC_DAEMON_INTEGRITY);
        }
-       if (!lib->plugins->load(lib->plugins, NULL,
+       if (!lib->plugins->load(lib->plugins,
                        lib->settings->get_str(lib->settings, "pki.load", PLUGINS)))
        {
                exit(SS_RC_INITIALIZATION_FAILED);

diff --git a/src/scepclient/scepclient.c b/src/scepclient/scepclient.c
index 11174c96f502b1d12147bbf8f5849daf91bd1d63..1267370badc3b667ac1511304956e6310f2f73fa 100644 (file)
--- a/src/scepclient/scepclient.c
+++ b/src/scepclient/scepclient.c
@@ -924,7 +924,7 @@ int main(int argc, char **argv)
        init_log("scepclient");
 
        /* load plugins, further infrastructure may need it */
-       if (!lib->plugins->load(lib->plugins, NULL,
+       if (!lib->plugins->load(lib->plugins,
                        lib->settings->get_str(lib->settings, "scepclient.load", PLUGINS)))
        {
                exit_scepclient("plugin loading failed");

diff --git a/src/starter/netkey.c b/src/starter/netkey.c
index 921a220db074b4d8af70def6ed6b36c09a9584d3..2b500bab46e9685bb3c8b5c86ab438a424881df9 100644 (file)
--- a/src/starter/netkey.c
+++ b/src/starter/netkey.c
@@ -58,7 +58,7 @@ bool starter_netkey_init(void)
 
 void starter_netkey_cleanup(void)
 {
-       if (!lib->plugins->load(lib->plugins, NULL,
+       if (!lib->plugins->load(lib->plugins,
                        lib->settings->get_str(lib->settings, "starter.load", PLUGINS)))
        {
                DBG1(DBG_APP, "unable to load kernel plugins");