From: Shea Levy <shea@shealevy.com>
Date: Tue, 30 Sep 2014 19:14:47 +0000 (-0400)
Subject: starter: Allow specifying the ipsec.conf location in strongswan.conf
X-Git-Tag: 5.2.1dr1~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90fe4b3f8ad9e81cc73eb323a183c925c7795bb5;p=thirdparty%2Fstrongswan.git

starter: Allow specifying the ipsec.conf location in strongswan.conf
---

diff --git a/conf/options/starter.opt b/conf/options/starter.opt
index 4e6574d58e..54689e9760 100644
--- a/conf/options/starter.opt
+++ b/conf/options/starter.opt
@@ -1,3 +1,6 @@
+starter.config_file = ${sysconfdir}/ipsec.conf
+	Location of the ipsec.conf file
+
 starter.load =
 	Plugins to load in starter.
 
diff --git a/src/starter/starter.c b/src/starter/starter.c
index ea8a999f0a..74b5b52861 100644
--- a/src/starter/starter.c
+++ b/src/starter/starter.c
@@ -489,7 +489,8 @@ int main (int argc, char **argv)
 	}
 	if (!config_file)
 	{
-		config_file = CONFIG_FILE;
+		config_file = lib->settings->get_str(lib->settings,
+											 "starter.config_file", CONFIG_FILE);
 	}
 
 	init_log("ipsec_starter");