X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fust-consumer%2Fust-consumer.c;h=0856cf0b9d3abf0858ca693b664ab5e542e5bbfb;hp=ff9d31d5287a92b29bf6ac16bff0e6a17876d837;hb=e5add6d004793894ef4c7e047bc0f8885763b205;hpb=3aa937ab446c323bec53fc3581c424a3cc5c020e

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index ff9d31d52..0856cf0b9 100644
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -2008,8 +2008,8 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 	case LTTNG_CONSUMER_CREATE_TRACE_CHUNK:
 	{
 		const struct lttng_credentials credentials = {
-			.uid = msg.u.create_trace_chunk.credentials.uid,
-			.gid = msg.u.create_trace_chunk.credentials.gid,
+			.uid = msg.u.create_trace_chunk.credentials.value.uid,
+			.gid = msg.u.create_trace_chunk.credentials.value.gid,
 		};
 		const bool is_local_trace =
 				!msg.u.create_trace_chunk.relayd_id.is_set;
@@ -2062,9 +2062,12 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 				!is_local_trace ? &relayd_id : NULL,
 				msg.u.create_trace_chunk.session_id,
 				msg.u.create_trace_chunk.chunk_id,
-				(time_t) msg.u.create_trace_chunk.creation_timestamp,
+				(time_t) msg.u.create_trace_chunk
+						.creation_timestamp,
 				chunk_override_name,
-				&credentials,
+				msg.u.create_trace_chunk.credentials.is_set ?
+						&credentials :
+						NULL,
 				chunk_directory_handle.is_set ?
 						&chunk_directory_handle.value :
 						NULL);