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
@@ -105,8 +105,7 @@ credentials/credential_set.h
INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/charon
AM_CFLAGS = -rdynamic \
-DIPSEC_DIR=\"${ipsecdir}\" \
-DIPSEC_PIDDIR=\"${piddir}\" \
-DSTRONGSWAN_CONF=\"${strongswan_conf}\"
-DIPSEC_PIDDIR=\"${piddir}\"
charon_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -lpthread -lm $(DLLIB) $(SOCKLIB)
# compile options
+1 -1
View File
@@ -684,7 +684,7 @@ int main(int argc, char *argv[])
dbg = dbg_stderr;
/* initialize library */
if (!library_init(STRONGSWAN_CONF))
if (!library_init(NULL))
{
library_deinit();
exit(SS_RC_LIBSTRONGSWAN_INTEGRITY);
-1
View File
@@ -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
+1 -1
View File
@@ -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);
}