From b67069b00cc8878b6f8fbe55e0498359e6f55413 Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Thu, 15 May 2014 15:12:35 +0200 Subject: [PATCH] swanctl: Concatenate relative certificate paths correctly on Windows --- src/swanctl/commands/load_conns.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/swanctl/commands/load_conns.c b/src/swanctl/commands/load_conns.c index d418cd3a48..c551601df7 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; } } -- 2.47.2