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/charon/plugins/sql | |
| 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/charon/plugins/sql')
| -rw-r--r-- | src/charon/plugins/sql/Makefile.am | 1 | ||||
| -rw-r--r-- | src/charon/plugins/sql/pool.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/charon/plugins/sql/Makefile.am b/src/charon/plugins/sql/Makefile.am index bf4963f29..bbbc5a2e5 100644 --- 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 c029dea24..d59c4c811 100644 --- 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); |