stroke: Use thread-safe dirname(3)

diff --git a/src/libcharon/plugins/stroke/stroke_cred.c b/src/libcharon/plugins/stroke/stroke_cred.c
index a73c940b199ba6d3a1cb3e571b05e2092fa6847d..f908219ed268dc2db312522fc95fec3532caec47 100644 (file)
--- a/src/libcharon/plugins/stroke/stroke_cred.c
+++ b/src/libcharon/plugins/stroke/stroke_cred.c
@@ -17,7 +17,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <limits.h>
-#include <libgen.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <unistd.h>
@@ -1130,7 +1129,7 @@ static void load_secrets(private_stroke_cred_t *this, mem_cred_t *secrets,
                }
                if (line.len > strlen("include ") && strpfx(line.ptr, "include "))
                {
-                       char **expanded, *path, *dir, pattern[PATH_MAX];
+                       char **expanded, *dir, pattern[PATH_MAX];
                        u_char *pos;
 
                        if (level > MAX_SECRETS_RECURSION)
@@ -1158,18 +1157,17 @@ static void load_secrets(private_stroke_cred_t *this, mem_cred_t *secrets,
                        }
                        else
                        {       /* use directory of current file if relative */
-                               path = strdup(file);
-                               dir = dirname(path);
+                               dir = path_dirname(file);
 
                                if (line.len + 1 + strlen(dir) + 1 > sizeof(pattern))
                                {
                                        DBG1(DBG_CFG, "include pattern too long, ignored");
-                                       free(path);
+                                       free(dir);
                                        continue;
                                }
                                snprintf(pattern, sizeof(pattern), "%s/%.*s",
                                                 dir, (int)line.len, line.ptr);
-                               free(path);
+                               free(dir);
                        }
 #ifdef HAVE_GLOB_H
                        {