diff options
author | Martin Willi <martin@strongswan.org> | 2009-09-08 20:01:13 +0200 |
---|---|---|
committer | Martin Willi <martin@strongswan.org> | 2009-09-10 18:52:42 +0200 |
commit | 356b2b2780fc52be410ff6e03a23eb1993bfe3fc (patch) | |
tree | 6ae4d5b38e2dab100ce374449493579719476682 /src/charon/plugins | |
parent | 5b03a350fc7093aa6984dfcafede98fbb62809eb (diff) | |
download | strongswan-356b2b2780fc52be410ff6e03a23eb1993bfe3fc.tar.bz2 strongswan-356b2b2780fc52be410ff6e03a23eb1993bfe3fc.tar.xz |
pass NULL to library_init() to load settings from default file
Diffstat (limited to 'src/charon/plugins')
-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 bbbc5a2e5..c6a382c4e 100644 --- a/src/charon/plugins/sql/Makefile.am +++ b/src/charon/plugins/sql/Makefile.am @@ -2,7 +2,6 @@ INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/charon AM_CFLAGS = -rdynamic \ - -DSTRONGSWAN_CONF=\"${strongswan_conf}\" \ -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 d59c4c811..55d82dac7 100644 --- a/src/charon/plugins/sql/pool.c +++ b/src/charon/plugins/sql/pool.c @@ -624,7 +624,7 @@ int main(int argc, char *argv[]) atexit(library_deinit); /* initialize library */ - if (!library_init(STRONGSWAN_CONF)) + if (!library_init(NULL)) { exit(SS_RC_LIBSTRONGSWAN_INTEGRITY); } |