X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng-sessiond%2Fmain.c;h=a2532d0479463c6152c895efe90e5f8d3546080c;hp=55fd5e7bf5622b8a7fc71e5987712bb6c13fcfea;hb=e11d277bc11aafd396faebe83734971c814214e7;hpb=63a799e8de095a4e858acf5a264c86d3a84f21af

diff --git a/lttng-sessiond/main.c b/lttng-sessiond/main.c
index 55fd5e7bf..a2532d047 100644
--- a/lttng-sessiond/main.c
+++ b/lttng-sessiond/main.c
@@ -44,7 +44,7 @@
 #include <lttng/lttng-consumer.h>
 
 #include <lttngerr.h>
-#include <runas.h>
+#include "common/runas.h"
 
 #include "channel.h"
 #include "compat/poll.h"
@@ -174,14 +174,10 @@ static struct ltt_session_list *session_list_ptr;
 int ust_consumerd64_fd = -1;
 int ust_consumerd32_fd = -1;
 
-static const char *consumerd32_bin =
-	__stringify(CONFIG_CONSUMERD32_BIN);
-static const char *consumerd64_bin =
-	__stringify(CONFIG_CONSUMERD64_BIN);
-static const char *consumerd32_libdir =
-	__stringify(CONFIG_CONSUMERD32_LIBDIR);
-static const char *consumerd64_libdir =
-	__stringify(CONFIG_CONSUMERD64_LIBDIR);
+static const char *consumerd32_bin = CONFIG_CONSUMERD32_BIN;
+static const char *consumerd64_bin = CONFIG_CONSUMERD64_BIN;
+static const char *consumerd32_libdir = CONFIG_CONSUMERD32_LIBDIR;
+static const char *consumerd64_libdir = CONFIG_CONSUMERD64_LIBDIR;
 
 static
 void setup_consumerd_path(void)
@@ -1753,7 +1749,7 @@ static int mount_debugfs(char *path)
 	int ret;
 	char *type = "debugfs";
 
-	ret = mkdir_recursive_run_as(path, S_IRWXU | S_IRWXG, geteuid(), getegid());
+	ret = run_as_mkdir_recursive(path, S_IRWXU | S_IRWXG, geteuid(), getegid());
 	if (ret < 0) {
 		PERROR("Cannot create debugfs path");
 		goto error;
@@ -1908,7 +1904,7 @@ static int create_ust_session(struct ltt_session *session,
 		goto error;
 	}
 
-	ret = mkdir_recursive_run_as(lus->pathname, S_IRWXU | S_IRWXG,
+	ret = run_as_mkdir_recursive(lus->pathname, S_IRWXU | S_IRWXG,
 			session->uid, session->gid);
 	if (ret < 0) {
 		if (ret != -EEXIST) {
@@ -1958,7 +1954,7 @@ static int create_kernel_session(struct ltt_session *session)
 		session->kernel_session->consumer_fd = kconsumer_data.cmd_sock;
 	}
 
-	ret = mkdir_recursive_run_as(session->kernel_session->trace_path,
+	ret = run_as_mkdir_recursive(session->kernel_session->trace_path,
 			S_IRWXU | S_IRWXG, session->uid, session->gid);
 	if (ret < 0) {
 		if (ret != -EEXIST) {