X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-consumer.c;h=a3e7eea008aee322566ff32a622871cfe6d060f9;hp=c39a87fba7895da17d663bee882c85c480e7f4d3;hb=1f4962443f25c371e4b54e97f9eb867d67cbf88e;hpb=d295668767ac8234e83984e1812d342d03293d88

diff --git a/src/bin/lttng-sessiond/ust-consumer.c b/src/bin/lttng-sessiond/ust-consumer.c
index c39a87fba..a3e7eea00 100644
--- a/src/bin/lttng-sessiond/ust-consumer.c
+++ b/src/bin/lttng-sessiond/ust-consumer.c
@@ -30,67 +30,11 @@
 #include "consumer.h"
 #include "health-sessiond.h"
 #include "ust-consumer.h"
+#include "lttng-ust-error.h"
 #include "buffer-registry.h"
 #include "session.h"
 #include "lttng-sessiond.h"
 
-/*
- * Return allocated full pathname of the session using the consumer trace path
- * and subdir if available.
- *
- * The caller can safely free(3) the returned value. On error, NULL is
- * returned.
- */
-static char *setup_channel_trace_path(struct consumer_output *consumer,
-		struct ust_app_session *ua_sess)
-{
-	int ret;
-	char *pathname;
-
-	assert(consumer);
-	assert(ua_sess);
-
-	health_code_update();
-
-	/*
-	 * Allocate the string ourself to make sure we never exceed
-	 * LTTNG_PATH_MAX.
-	 */
-	pathname = zmalloc(LTTNG_PATH_MAX);
-	if (!pathname) {
-		goto error;
-	}
-
-	/* Get correct path name destination */
-	if (consumer->type == CONSUMER_DST_LOCAL) {
-		/* Set application path to the destination path */
-		ret = snprintf(pathname, LTTNG_PATH_MAX, "%s%s",
-				consumer->domain_subdir, ua_sess->path);
-		DBG3("Userspace local consumer trace path relative to current trace chunk: \"%s\"",
-				pathname);
-	} else {
-		ret = snprintf(pathname, LTTNG_PATH_MAX, "%s%s/%s%s",
-				consumer->dst.net.base_dir,
-				consumer->chunk_path,
-				consumer->domain_subdir,
-				ua_sess->path);
-	}
-	if (ret < 0) {
-		PERROR("Failed to format channel path");
-		goto error;
-	} else if (ret >= LTTNG_PATH_MAX) {
-		ERR("Truncation occurred while formatting channel path");
-		ret = -1;
-		goto error;
-	}
-
-	return pathname;
-
-error:
-	free(pathname);
-	return NULL;
-}
-
 /*
  * Send a single channel to the consumer using command ASK_CHANNEL_CREATION.
  *
@@ -123,7 +67,7 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
 
 	is_local_trace = consumer->net_seq_index == -1ULL;
 	/* Format the channel's path (relative to the current trace chunk). */
-	pathname = setup_channel_trace_path(consumer, ua_sess);
+	pathname = setup_channel_trace_path(consumer, ua_sess->path);
 	if (!pathname) {
 		ret = -1;
 		goto error;
@@ -214,10 +158,11 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
 			ua_chan->tracefile_count,
 			ua_sess->id,
 			ua_sess->output_traces,
-			ua_sess->uid,
+			ua_sess->real_credentials.uid,
 			ua_chan->attr.blocking_timeout,
 			root_shm_path, shm_path,
-			trace_chunk);
+			trace_chunk,
+			&ua_sess->effective_credentials);
 
 	health_code_update();