aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2014-09-30 15:14:47 -0400
committerTobias Brunner <tobias@strongswan.org>2014-10-02 14:33:08 +0200
commit90fe4b3f8ad9e81cc73eb323a183c925c7795bb5 (patch)
treea0db66abbe9b32a4bf45a73e3acc1687d4473e32 /src
parent213e02b8725e5d1401d231a7de9d1cf30fcee2eb (diff)
downloadstrongswan-90fe4b3f8ad9e81cc73eb323a183c925c7795bb5.tar.bz2
strongswan-90fe4b3f8ad9e81cc73eb323a183c925c7795bb5.tar.xz
starter: Allow specifying the ipsec.conf location in strongswan.conf
Diffstat (limited to 'src')
-rw-r--r--src/starter/starter.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/starter/starter.c b/src/starter/starter.c
index ea8a999f0..74b5b5286 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");