pass NULL to library_init() to load settings from default file
This commit is contained in:
@@ -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
@@ -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);
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user