aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2014-09-30 14:31:50 -0400
committerTobias Brunner <tobias@strongswan.org>2014-10-02 14:28:01 +0200
commit5fea45506ee3c0712bb62d6ba311459164036d7e (patch)
tree2fa121ad911b4920e01da6ebc4cbbb672eaadb75 /src
parent0efea2fd86e0d0ffb04628f4806ea313bc692f2a (diff)
downloadstrongswan-5fea45506ee3c0712bb62d6ba311459164036d7e.tar.bz2
strongswan-5fea45506ee3c0712bb62d6ba311459164036d7e.tar.xz
library: Allow specifying the path to strongswan.conf in the STRONGSWAN_CONF env var
Diffstat (limited to 'src')
-rw-r--r--src/libstrongswan/library.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstrongswan/library.c b/src/libstrongswan/library.c
index 715f5bc43..dc73ccc68 100644
--- a/src/libstrongswan/library.c
+++ b/src/libstrongswan/library.c
@@ -263,7 +263,7 @@ bool library_init(char *settings, const char *namespace)
.get = _get,
.set = _set,
.ns = strdup(namespace ?: "libstrongswan"),
- .conf = strdupnull(settings ?: STRONGSWAN_CONF),
+ .conf = strdupnull(settings ?: (getenv("STRONGSWAN_CONF") ?: STRONGSWAN_CONF)),
},
.ref = 1,
);