denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

swanctl: Concatenate relative certificate paths correctly on Windows

Browse Source
This commit is contained in:
Martin Willi
2014-06-04 15:53:09 +02:00
parent bc9fd3735d
commit b67069b00c
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/swanctl/commands/load_conns.c
+5 -3
View File
@@ -102,16 +102,18 @@ static void add_file_list_key(vici_req_t *req, char *key, char *value)
enumerator = enumerator_create_token(value, ",", " "); enumerator = enumerator_create_token(value, ",", " ");
while (enumerator->enumerate(enumerator, &token)) while (enumerator->enumerate(enumerator, &token))
{ {
if (*token != '/') if (!path_absolute(token))
{ {
if (streq(key, "certs")) 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; token = buf;
} }
if (streq(key, "cacerts")) 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; token = buf;
} }
} }