From 356b2b2780fc52be410ff6e03a23eb1993bfe3fc Mon Sep 17 00:00:00 2001
From: Martin Willi <martin@strongswan.org>
Date: Tue, 8 Sep 2009 20:01:13 +0200
Subject: pass NULL to library_init() to load settings from default file

---
 src/medsrv/Makefile.am | 1 -
 src/medsrv/main.c      | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/medsrv')

diff --git a/src/medsrv/Makefile.am b/src/medsrv/Makefile.am
index be9360bca..9f5c9e2f7 100644
--- a/src/medsrv/Makefile.am
+++ b/src/medsrv/Makefile.am
@@ -11,7 +11,6 @@ medsrv_fcgi_LDADD = $(top_builddir)/src/libfast/libfast.la
 
 INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libfast
 AM_CFLAGS = -rdynamic \
-  -DSTRONGSWAN_CONF=\"${strongswan_conf}\" \
   -DIPSECDIR=\"${ipsecdir}\" \
   -DIPSEC_PIDDIR=\"${piddir}\" \
   -DPLUGINS=\""${libstrongswan_plugins}\""
diff --git a/src/medsrv/main.c b/src/medsrv/main.c
index 15d1f7fb8..1f43a7e17 100644
--- a/src/medsrv/main.c
+++ b/src/medsrv/main.c
@@ -33,7 +33,7 @@ int main(int arc, char *argv[])
 	char *uri;
 	int timeout, threads;
 
-	library_init(STRONGSWAN_CONF);
+	library_init(NULL);
 	if (!lib->plugins->load(lib->plugins, NULL,
 			lib->settings->get_str(lib->settings, "medsrv.load", PLUGINS)))
 	{
-- 
cgit v1.2.3