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 -2
View File
@@ -1,7 +1,6 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan
AM_CFLAGS = \
-DPLUGINS="\"${libstrongswan_plugins}\"" \
-DSTRONGSWAN_CONF=\"${strongswan_conf}\"
-DPLUGINS="\"${libstrongswan_plugins}\""
noinst_PROGRAMS = bin2array bin2sql id2sql key2keyid keyid2sql \
thread_analysis dh_speed pubkey_speed
+1 -1
View File
@@ -101,7 +101,7 @@ int main(int argc, char *argv[])
usage();
}
library_init(STRONGSWAN_CONF);
library_init(NULL);
lib->plugins->load(lib->plugins, NULL, argv[1]);
atexit(library_deinit);
+1 -1
View File
@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
usage();
}
library_init(STRONGSWAN_CONF);
library_init(NULL);
lib->plugins->load(lib->plugins, NULL, argv[1]);
atexit(library_deinit);