diff options
| author | Martin Willi <martin@revosec.ch> | 2014-06-04 16:26:58 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2014-06-04 16:26:58 +0200 |
| commit | 8c55f8ef42816a695895990cf89697a30c235355 (patch) | |
| tree | c4aa8a3f0f08166b37369bb93132d0ece470af42 /src/swanctl/commands/load_conns.c | |
| parent | b4c51061c3c649e948324d1f3ad37ef6e48f8b96 (diff) | |
| parent | d930d184177ef352c4b5def4e5848463819435ec (diff) | |
| download | strongswan-8c55f8ef42816a695895990cf89697a30c235355.tar.bz2 strongswan-8c55f8ef42816a695895990cf89697a30c235355.tar.xz | |
Merge branch 'win'
Ports the strongSwan core libraries and some plugins to the Windows platform
using a MinGW based toolchain. Beside generic platform abstraction and
the windows.[ch] compatibility layer, this merge introduces a Windows native
threading backend and a charon-svc Windows IKE service.
Travis adds a MinGW cross-compile build to Windows, and further enables -Werror
to let builds fail for all compiler warnings with gcc and Clang.
Diffstat (limited to 'src/swanctl/commands/load_conns.c')
| -rw-r--r-- | src/swanctl/commands/load_conns.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/swanctl/commands/load_conns.c b/src/swanctl/commands/load_conns.c index d418cd3a4..c551601df 100644 --- a/src/swanctl/commands/load_conns.c +++ b/src/swanctl/commands/load_conns.c @@ -102,16 +102,18 @@ static void add_file_list_key(vici_req_t *req, char *key, char *value) enumerator = enumerator_create_token(value, ",", " "); while (enumerator->enumerate(enumerator, &token)) { - if (*token != '/') + if (!path_absolute(token)) { if (streq(key, "certs")) { - snprintf(buf, sizeof(buf), "%s/%s", SWANCTL_X509DIR, token); + snprintf(buf, sizeof(buf), "%s%s%s", + SWANCTL_X509DIR, DIRECTORY_SEPARATOR, token); token = buf; } if (streq(key, "cacerts")) { - snprintf(buf, sizeof(buf), "%s/%s", SWANCTL_X509CADIR, token); + snprintf(buf, sizeof(buf), "%s%s%s", + SWANCTL_X509CADIR, DIRECTORY_SEPARATOR, token); token = buf; } } |