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/manager | |
| 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/manager')
| -rw-r--r-- | src/manager/Makefile.am | 1 | ||||
| -rw-r--r-- | src/manager/main.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/manager/Makefile.am b/src/manager/Makefile.am index b5948c0a8..e6c31e9b4 100644 --- a/src/manager/Makefile.am +++ b/src/manager/Makefile.am @@ -14,7 +14,6 @@ manager_fcgi_LDADD = $(top_builddir)/src/libfast/libfast.la ${xml_LIBS} INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libfast ${xml_CFLAGS} AM_CFLAGS = -rdynamic \ - -DSTRONGSWAN_CONF=\"${strongswan_conf}\" \ -DIPSECDIR=\"${ipsecdir}\" \ -DIPSEC_PIDDIR=\"${piddir}\" \ -DPLUGINS=\""${libstrongswan_plugins}\"" diff --git a/src/manager/main.c b/src/manager/main.c index 990beda4d..1f5c45113 100644 --- a/src/manager/main.c +++ b/src/manager/main.c @@ -34,7 +34,7 @@ int main (int arc, char *argv[]) bool debug; int threads, timeout; - library_init(STRONGSWAN_CONF); + library_init(NULL); if (!lib->plugins->load(lib->plugins, NULL, lib->settings->get_str(lib->settings, "manager.load", PLUGINS))) { |