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

diff --git a/lttng-sessiond/main.c b/lttng-sessiond/main.c
index 04ac25d0f..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)
@@ -1540,13 +1536,21 @@ static pid_t spawn_consumerd(struct consumer_data *consumer_data)
 			 * sessiond's installation directory, and
 			 * fallback on the 32-bit one, 
 			 */
+			DBG3("Looking for a kernel consumer at these locations:");
+			DBG3("	1) %s", consumerd64_bin);
+			DBG3("	2) %s/%s", INSTALL_BIN_PATH, CONSUMERD_FILE);
+			DBG3("	3) %s", consumerd32_bin);
 			if (stat(consumerd64_bin, &st) == 0) {
+				DBG3("Found location #1");
 				consumer_to_use = consumerd64_bin;
 			} else if (stat(INSTALL_BIN_PATH "/" CONSUMERD_FILE, &st) == 0) {
+				DBG3("Found location #2");
 				consumer_to_use = INSTALL_BIN_PATH "/" CONSUMERD_FILE;
 			} else if (stat(consumerd32_bin, &st) == 0) {
+				DBG3("Found location #3");
 				consumer_to_use = consumerd32_bin;
 			} else {
+				DBG("Could not find any valid consumerd executable");
 				break;
 			}
 			DBG("Using kernel consumer at: %s",  consumer_to_use);
@@ -1745,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;
@@ -1900,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) {
@@ -1950,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) {
@@ -2916,7 +2920,7 @@ static int cmd_stop_trace(struct ltt_session *session)
 	usess = session->ust_session;
 
 	if (!session->enabled) {
-		ret = LTTCOMM_UST_START_FAIL;
+		ret = LTTCOMM_UST_STOP_FAIL;
 		goto error;
 	}
 
@@ -2953,7 +2957,7 @@ static int cmd_stop_trace(struct ltt_session *session)
 
 		ret = ust_app_stop_trace_all(usess);
 		if (ret < 0) {
-			ret = LTTCOMM_UST_START_FAIL;
+			ret = LTTCOMM_UST_STOP_FAIL;
 			goto error;
 		}
 	}