added ./configure option --with-strongswan-conf=

defaults to /etc/strongswan.conf

configure.in

@@ -52,6 +52,13 @@ AC_ARG_WITH(
 	[AC_DEFINE_UNQUOTED(RESOLV_CONF, "${sysconfdir}/resolv.conf")]
 )
 
+AC_ARG_WITH(
+	[strongswan-conf],
+	AS_HELP_STRING([--with-strongswan-conf=file],[strongswan.conf file other than "sysconfdir/strongswan.conf"]),
+	[AC_DEFINE_UNQUOTED(STRONGSWAN_CONF, "$withval")],
+	[AC_DEFINE_UNQUOTED(STRONGSWAN_CONF, "${sysconfdir}/strongswan.conf")]
+)
+
 AC_ARG_WITH(
 	[urandom-device],
 	AS_HELP_STRING([--with-urandom-device=dev],[set the device for pseudo random data other than "/dev/urandom"]),

src/charon/daemon.c

@@ -486,7 +486,7 @@ int main(int argc, char *argv[])
 	dbg = dbg_silent;
 	
 	/* initialize library */
-	library_init(IPSEC_DIR "/strongswan.conf");
+	library_init(STRONGSWAN_CONF);
 	lib->plugins->load(lib->plugins, IPSEC_PLUGINDIR, "libstrongswan-");
 	lib->printf_hook->add_handler(lib->printf_hook, 'R',
 								  traffic_selector_get_printf_hooks());

src/libstrongswan/fips/fips_signer.c

@@ -27,7 +27,7 @@ int main(int argc, char* argv[])
 	char  hmac_signature[BUF_LEN];
 
 	/* initialize library */
-	library_init(IPSEC_DIR "/strongswan.conf");
+	library_init(STRONGSWAN_CONF);
 	lib->plugins->load(lib->plugins, IPSEC_PLUGINDIR, "libstrongswan-");
 
 	if (!fips_compute_hmac_signature(hmac_key, hmac_signature))

src/manager/main.c

@@ -36,7 +36,7 @@ int main (int arc, char *argv[])
 	bool debug;
 	int threads, timeout;
 
-	library_init(IPSECDIR "/strongswan.conf");
+	library_init(STRONGSWAN_CONF);
 	lib->plugins->load(lib->plugins, IPSEC_PLUGINDIR, "libstrongswan-");
 	
 	socket = lib->settings->get_str(lib->settings, "manager.socket", NULL);

src/openac/Makefile.am

@@ -4,7 +4,6 @@ dist_man_MANS = openac.8
 
 INCLUDES = -I$(top_srcdir)/src/libstrongswan
 AM_CFLAGS = -DIPSEC_CONFDIR=\"${confdir}\" \
-            -DIPSEC_DIR=\"${ipsecdir}\" \
 	        -DIPSEC_PLUGINDIR=\"${plugindir}\"
 openac_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -lgmp
 

src/openac/openac.c

@@ -267,7 +267,7 @@ int main(int argc, char **argv)
 	openlog("openac", 0, LOG_AUTHPRIV);
 
 	/* initialize library */
-	library_init(IPSEC_DIR "/strongswan.conf");
+	library_init(STRONGSWAN_CONF);
 	lib->plugins->load(lib->plugins, IPSEC_PLUGINDIR, "libstrongswan-");
 
 	/* initialize optionsfrom */