use NULL to load plugins from default plugin directory

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 6c28b948fceee17bd32758df3a1ff1a53483b139..8a70d79e26b13a5a81bd64f0b950cb0eca547978 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1,6 +1,5 @@
 INCLUDES = -I$(top_srcdir)/src/libstrongswan
 AM_CFLAGS = \
--DIPSEC_PLUGINDIR=\"${plugindir}\" \
 -DPLUGINS="\"${libstrongswan_plugins}\"" \
 -DSTRONGSWAN_CONF=\"${strongswan_conf}\"
 

diff --git a/scripts/dh_speed.c b/scripts/dh_speed.c
index 5a57badb676307219b9e3ac83b2f5d999419f072..80a1d2d300d5dd2444f53b9c669a0f09cd0fd50e 100644 (file)
--- a/scripts/dh_speed.c
+++ b/scripts/dh_speed.c
@@ -102,7 +102,7 @@ int main(int argc, char *argv[])
        }
 
        library_init(STRONGSWAN_CONF);
-       lib->plugins->load(lib->plugins, IPSEC_PLUGINDIR, argv[1]);
+       lib->plugins->load(lib->plugins, NULL, argv[1]);
        atexit(library_deinit);
 
        rounds = atoi(argv[2]);

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

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

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

diff --git a/src/charon/Makefile.am b/src/charon/Makefile.am
index 20ca08302b6a814e1a9d0137b9a54f7b3949151c..54fc7646760f671b1321a73286349bd361061d03 100644 (file)
--- a/src/charon/Makefile.am
+++ b/src/charon/Makefile.am
@@ -106,7 +106,6 @@ INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/
 AM_CFLAGS = -rdynamic \
   -DIPSEC_DIR=\"${ipsecdir}\" \
   -DIPSEC_PIDDIR=\"${piddir}\" \
-  -DIPSEC_PLUGINDIR=\"${plugindir}\" \
   -DSTRONGSWAN_CONF=\"${strongswan_conf}\"
 charon_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -lpthread -lm $(DLLIB) $(SOCKLIB)
 

diff --git a/src/charon/daemon.c b/src/charon/daemon.c
index 260fc5eadbc51408fa96a10cee44b4e832c22d9f..258043032c0298dc56269b789e6f4d39fab63f62 100644 (file)
--- a/src/charon/daemon.c
+++ b/src/charon/daemon.c
@@ -491,7 +491,7 @@ static bool initialize(private_daemon_t *this, bool syslog, level_t levels[])
        this->public.traps = trap_manager_create();
 
        /* load plugins, further infrastructure may need it */
-       if (!lib->plugins->load(lib->plugins, IPSEC_PLUGINDIR,
+       if (!lib->plugins->load(lib->plugins, NULL,
                        lib->settings->get_str(lib->settings, "charon.load", PLUGINS)))
        {
                return FALSE;

diff --git a/src/charon/plugins/sql/Makefile.am b/src/charon/plugins/sql/Makefile.am
index bf4963f291fc55635377ae94a43ffff49d86aec6..bbbc5a2e5fffc408f3fd5fcb92c6cef5ffd6e4e8 100644 (file)
--- a/src/charon/plugins/sql/Makefile.am
+++ b/src/charon/plugins/sql/Makefile.am
@@ -3,7 +3,6 @@ INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/charon
 
 AM_CFLAGS = -rdynamic \
   -DSTRONGSWAN_CONF=\"${strongswan_conf}\" \
-  -DIPSEC_PLUGINDIR=\"${plugindir}\" \
   -DPLUGINS=\""${libstrongswan_plugins}\""
 
 plugin_LTLIBRARIES = libstrongswan-sql.la

diff --git a/src/charon/plugins/sql/pool.c b/src/charon/plugins/sql/pool.c
index c029dea24efab18be0a167dd0e0ae1a0425348d3..d59c4c8114720ebdaffa5feb5b0e726d790d17b3 100644 (file)
--- a/src/charon/plugins/sql/pool.c
+++ b/src/charon/plugins/sql/pool.c
@@ -634,7 +634,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, IPSEC_PLUGINDIR,
+       if (!lib->plugins->load(lib->plugins, NULL,
                        lib->settings->get_str(lib->settings, "pool.load", PLUGINS)))
        {
                exit(SS_RC_INITIALIZATION_FAILED);

diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am
index 570c14e403b55c49332e4cba3185590f99499756..ebf7e4e9a070104b3d47d66efbb10f8883ea800c 100644 (file)
--- a/src/libstrongswan/Makefile.am
+++ b/src/libstrongswan/Makefile.am
@@ -54,7 +54,7 @@ libstrongswan_la_LIBADD = -lpthread $(DLLIB) $(BTLIB) $(SOCKLIB) $(RTLIB)
 INCLUDES = -I$(top_srcdir)/src/libstrongswan
 AM_CFLAGS = \
 -DIPSEC_DIR=\"${ipsecdir}\" \
--DIPSEC_PLUGINDIR=\"${plugindir}\"
+-DPLUGINDIR=\"${plugindir}\"
 
 if USE_LEAK_DETECTIVE
   AM_CFLAGS += -DLEAK_DETECTIVE

diff --git a/src/libstrongswan/plugins/plugin_loader.c b/src/libstrongswan/plugins/plugin_loader.c
index 644ac1fd218613a90ab998602def68b44389b037..d4513f25ae1cd1ccb3a7bdc2572580adc83f1b4c 100644 (file)
--- a/src/libstrongswan/plugins/plugin_loader.c
+++ b/src/libstrongswan/plugins/plugin_loader.c
@@ -116,6 +116,11 @@ static bool load(private_plugin_loader_t *this, char *path, char *list)
        char *token;
        bool critical_failed = FALSE;
 
+       if (path == NULL)
+       {
+               path = PLUGINDIR;
+       }
+
        enumerator = enumerator_create_token(list, " ", " ");
        while (!critical_failed && enumerator->enumerate(enumerator, &token))
        {

diff --git a/src/libstrongswan/plugins/plugin_loader.h b/src/libstrongswan/plugins/plugin_loader.h
index 0967b7900f2a28016060ab1dc455e82498606526..f72c91c60fa9875ccbcecd184034b526c023f2f9 100644 (file)
--- a/src/libstrongswan/plugins/plugin_loader.h
+++ b/src/libstrongswan/plugins/plugin_loader.h
@@ -37,7 +37,7 @@ struct plugin_loader_t {
         * as a critical plugin. If loading a critical plugin fails, plugin loading
         * is aborted and FALSE is returned.
         *
-        * @param path                  path containing loadable plugins
+        * @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
         */

diff --git a/src/manager/Makefile.am b/src/manager/Makefile.am
index 6c50f1563ac9653fb53301d3475c9caacf4453fd..b5948c0a8e6ea29d255c00fc8d2712a99a4d5b0d 100644 (file)
--- a/src/manager/Makefile.am
+++ b/src/manager/Makefile.am
@@ -17,7 +17,6 @@ AM_CFLAGS = -rdynamic \
   -DSTRONGSWAN_CONF=\"${strongswan_conf}\" \
   -DIPSECDIR=\"${ipsecdir}\" \
   -DIPSEC_PIDDIR=\"${piddir}\" \
-  -DIPSEC_PLUGINDIR=\"${plugindir}\"\
   -DPLUGINS=\""${libstrongswan_plugins}\""
 
 # Don't forget to add templates to EXTRA_DIST !!! How to automate?

diff --git a/src/manager/main.c b/src/manager/main.c
index 9152f56ba41e4a38287b92139f8c1b1ba88e8624..990beda4dc90a489d72f9a861cce547464d0b5d7 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(STRONGSWAN_CONF);
-       if (!lib->plugins->load(lib->plugins, IPSEC_PLUGINDIR,
+       if (!lib->plugins->load(lib->plugins, NULL,
                        lib->settings->get_str(lib->settings, "manager.load", PLUGINS)))
        {
                return 1;

diff --git a/src/medsrv/Makefile.am b/src/medsrv/Makefile.am
index 8a0703e11027cace28da08121cc458a6eb68c211..be9360bca86f8d3e2b5c20390066937557d31a27 100644 (file)
--- a/src/medsrv/Makefile.am
+++ b/src/medsrv/Makefile.am
@@ -14,7 +14,6 @@ AM_CFLAGS = -rdynamic \
   -DSTRONGSWAN_CONF=\"${strongswan_conf}\" \
   -DIPSECDIR=\"${ipsecdir}\" \
   -DIPSEC_PIDDIR=\"${piddir}\" \
-  -DIPSEC_PLUGINDIR=\"${plugindir}\"\
   -DPLUGINS=\""${libstrongswan_plugins}\""
 
 # Don't forget to add templates to EXTRA_DIST !!! How to automate?

diff --git a/src/medsrv/main.c b/src/medsrv/main.c
index d66d01ecfb5f8fd8092016153e7fe5b2905d9e53..15d1f7fb81686adb99d3f5db14ff5332e4684892 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(STRONGSWAN_CONF);
-       if (!lib->plugins->load(lib->plugins, IPSEC_PLUGINDIR,
+       if (!lib->plugins->load(lib->plugins, NULL,
                        lib->settings->get_str(lib->settings, "medsrv.load", PLUGINS)))
        {
                return 1;

diff --git a/src/openac/Makefile.am b/src/openac/Makefile.am
index b71e6a0e1fe03ccfabcd103fdb8b107ee208d0b2..e36b623ba2672551500a64f69a865f3d62c5fd95 100644 (file)
--- a/src/openac/Makefile.am
+++ b/src/openac/Makefile.am
@@ -6,7 +6,6 @@ INCLUDES = -I$(top_srcdir)/src/libstrongswan
 AM_CFLAGS = \
   -DIPSEC_CONFDIR=\"${sysconfdir}\" \
   -DSTRONGSWAN_CONF=\"${strongswan_conf}\" \
-  -DIPSEC_PLUGINDIR=\"${plugindir}\" \
   -DPLUGINS=\""${libstrongswan_plugins}\""
 openac_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 

diff --git a/src/openac/openac.c b/src/openac/openac.c
index 99af1774f67b42971be8ad1cd8eae437a2957786..de95643af263c940246b4b78dc7b14385f4a2c5b 100755 (executable)
--- a/src/openac/openac.c
+++ b/src/openac/openac.c
@@ -231,7 +231,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, IPSEC_PLUGINDIR,
+       if (!lib->plugins->load(lib->plugins, NULL,
                        lib->settings->get_str(lib->settings, "openac.load", PLUGINS)))
        {
                exit(SS_RC_INITIALIZATION_FAILED);

diff --git a/src/pki/Makefile.am b/src/pki/Makefile.am
index 3f2694d979dc448e921e9c05be82a8bfb4366418..7eb579502d91c8c943444c0001f0e70d3141ece3 100644 (file)
--- a/src/pki/Makefile.am
+++ b/src/pki/Makefile.am
@@ -7,6 +7,5 @@ pki_SOURCES = pki.c pki.h command.c command.h \
 pki_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 INCLUDES = -I$(top_srcdir)/src/libstrongswan
 AM_CFLAGS = \
-       -DPLUGINDIR=\"${plugindir}\" \
        -DPLUGINS=\""${libstrongswan_plugins}\"" \
        -DSTRONGSWAN_CONF=\"${strongswan_conf}\"

diff --git a/src/pki/pki.c b/src/pki/pki.c
index 896ad9da78223e15a48c1f32e16c0f0d93a85285..aa873a49e83d4e31485407c38a82347f76fe31d3 100644 (file)
--- a/src/pki/pki.c
+++ b/src/pki/pki.c
@@ -89,7 +89,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, PLUGINDIR,
+       if (!lib->plugins->load(lib->plugins, NULL,
                        lib->settings->get_str(lib->settings, "pki.load", PLUGINS)))
        {
                exit(SS_RC_INITIALIZATION_FAILED);

diff --git a/src/pluto/Makefile.am b/src/pluto/Makefile.am
index bac51e2e2a360c19adecc557a21da7188b3db534..77d366b36ab20fb8b1c3aeb1e5d88e4adc78a00b 100644 (file)
--- a/src/pluto/Makefile.am
+++ b/src/pluto/Makefile.am
@@ -68,7 +68,6 @@ AM_CFLAGS = \
 -DIPSEC_CONFDIR=\"${sysconfdir}\" \
 -DIPSEC_PIDDIR=\"${piddir}\" \
 -DSHARED_SECRETS_FILE=\"${confdir}/ipsec.secrets\" \
--DIPSEC_PLUGINDIR=\"${plugindir}\" \
 -DPLUGINS=\""${pluto_plugins}\"" \
 -DSTRONGSWAN_CONF=\"${strongswan_conf}\" \
 -DPKCS11_DEFAULT_LIB=\"${default_pkcs11}\" \

diff --git a/src/pluto/plutomain.c b/src/pluto/plutomain.c
index 0de8d4d5d63365a6beec422572d6a20bad2c5855..18e8228dfe6166a629c08dcda7f590fd927366d4 100644 (file)
--- a/src/pluto/plutomain.c
+++ b/src/pluto/plutomain.c
@@ -652,7 +652,7 @@ int main(int argc, char **argv)
        }
 
        /* load plugins, further infrastructure may need it */
-       if (!lib->plugins->load(lib->plugins, IPSEC_PLUGINDIR,
+       if (!lib->plugins->load(lib->plugins, NULL,
                        lib->settings->get_str(lib->settings, "pluto.load", PLUGINS)))
        {
                exit(SS_RC_INITIALIZATION_FAILED);

diff --git a/src/scepclient/Makefile.am b/src/scepclient/Makefile.am
index 063806916f909a9df766b5979b8abdc2ea4758f5..8a2837d5fa607a382ba968a2fe3b96a3bb3eb2e4 100644 (file)
--- a/src/scepclient/Makefile.am
+++ b/src/scepclient/Makefile.am
@@ -17,7 +17,6 @@ INCLUDES = \
 
 AM_CFLAGS = \
 -DIPSEC_CONFDIR=\"${sysconfdir}\" \
--DIPSEC_PLUGINDIR=\"${plugindir}\" \
 -DPLUGINS=\""${pluto_plugins}\"" \
 -DSTRONGSWAN_CONF=\"${strongswan_conf}\" \
 -DDEBUG -DNO_PLUTO

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