diff options
| author | Martin Willi <martin@strongswan.org> | 2008-05-15 14:01:26 +0000 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2008-05-15 14:01:26 +0000 |
| commit | a3d92a3745e37ef82f07532b1dbfe870bc487514 (patch) | |
| tree | 3cd9627d087558eb421ba18772ffa956f810b7d2 /src/charon/plugins/sql | |
| parent | 84770ded1e4f42ea5a85cfcfba6e60900d4141ae (diff) | |
| download | strongswan-a3d92a3745e37ef82f07532b1dbfe870bc487514.tar.bz2 strongswan-a3d92a3745e37ef82f07532b1dbfe870bc487514.tar.xz | |
plugin load configuration in strongswan.conf
some components accept a "component.load" option with a space separated list of plugins to load
libcharon- plugins are now handled the same way as libstrongswan- plugins
Diffstat (limited to 'src/charon/plugins/sql')
| -rw-r--r-- | src/charon/plugins/sql/Makefile.am | 6 | ||||
| -rw-r--r-- | src/charon/plugins/sql/pool.c | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/charon/plugins/sql/Makefile.am b/src/charon/plugins/sql/Makefile.am index c3910438a..7dc42c181 100644 --- a/src/charon/plugins/sql/Makefile.am +++ b/src/charon/plugins/sql/Makefile.am @@ -3,11 +3,11 @@ INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/charon AM_CFLAGS = -rdynamic -DIPSEC_PLUGINDIR=\"${plugindir}\" -plugin_LTLIBRARIES = libcharon-sql.la -libcharon_sql_la_SOURCES = sql_plugin.h sql_plugin.c \ +plugin_LTLIBRARIES = libstrongswan-sql.la +libstrongswan_sql_la_SOURCES = sql_plugin.h sql_plugin.c \ sql_config.h sql_config.c sql_cred.h sql_cred.c \ sql_attribute.h sql_attribute.c sql_logger.h sql_logger.c -libcharon_sql_la_LDFLAGS = -module +libstrongswan_sql_la_LDFLAGS = -module ipsec_PROGRAMS = pool pool_SOURCES = pool.c diff --git a/src/charon/plugins/sql/pool.c b/src/charon/plugins/sql/pool.c index 709c18c12..40ff6bc55 100644 --- a/src/charon/plugins/sql/pool.c +++ b/src/charon/plugins/sql/pool.c @@ -358,8 +358,9 @@ int main(int argc, char *argv[]) dbg = dbg_stderr; library_init(STRONGSWAN_CONF); atexit(library_deinit); - - lib->plugins->load(lib->plugins, IPSEC_PLUGINDIR, "libstrongswan-"); + lib->plugins->load(lib->plugins, IPSEC_PLUGINDIR, + lib->settings->get_str(lib->settings, "pool.load", + "sqlite mysql")); uri = lib->settings->get_str(lib->settings, "charon.plugins.sql.database", NULL); if (!uri) |