diff options
| author | Martin Willi <martin@strongswan.org> | 2009-09-08 19:48:34 +0200 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2009-09-10 18:52:42 +0200 |
| commit | 5b03a350fc7093aa6984dfcafede98fbb62809eb (patch) | |
| tree | 0f0ae851da9a7b454913710da1b068afe538f97a /src/pki | |
| parent | 6de28173f08e9ab0707698cb97ec54132b03cfd1 (diff) | |
| download | strongswan-5b03a350fc7093aa6984dfcafede98fbb62809eb.tar.bz2 strongswan-5b03a350fc7093aa6984dfcafede98fbb62809eb.tar.xz | |
use NULL to load plugins from default plugin directory
Diffstat (limited to 'src/pki')
| -rw-r--r-- | src/pki/Makefile.am | 1 | ||||
| -rw-r--r-- | src/pki/pki.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/pki/Makefile.am b/src/pki/Makefile.am index 3f2694d97..7eb579502 100644 --- 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 896ad9da7..aa873a49e 100644 --- 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); |