pass NULL to library_init() to load settings from default file

This commit is contained in:
Martin Willi
2009-09-10 18:52:42 +02:00
parent 5b03a350fc
commit 356b2b2780
22 changed files with 51 additions and 56 deletions
-1
View File
@@ -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}\""
+1 -1
View File
@@ -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)))
{