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
@@ -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}\"
+1 -1
View File
@@ -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);