use NULL to load plugins from default plugin directory

This commit is contained in:
Martin Willi
2009-09-10 18:52:42 +02:00
parent 6de28173f0
commit 5b03a350fc
24 changed files with 19 additions and 23 deletions
-1
View File
@@ -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?
+1 -1
View File
@@ -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;