X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcontext.c;h=6aacbad0ea1c96ad3375739ca908f765f1ba4370;hb=3a89d11a0ad0ca327e2df99eaf13d3a0c63e3af3;hp=a83cb46fc9dec796868dbb95157d901cb46cdb70;hpb=9d035200e9006c4d4cf6951c54641e06c0bdf2bc;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/context.c b/src/bin/lttng-sessiond/context.c
index a83cb46fc..6aacbad0e 100644
--- a/src/bin/lttng-sessiond/context.c
+++ b/src/bin/lttng-sessiond/context.c
@@ -132,6 +132,7 @@ static int add_uctx_to_channel(struct ltt_ust_session *usess, int domain,
 	/* Add ltt UST context node to ltt UST channel */
 	lttng_ht_add_unique_ulong(uchan->ctx, &uctx->node);
 	rcu_read_unlock();
+	cds_list_add_tail(&uctx->list, &uchan->ctx_list);
 
 	DBG("Context UST %d added to channel %s", uctx->ctx.ctx, uchan->name);
 
@@ -262,7 +263,7 @@ int context_ust_add(struct ltt_ust_session *usess, int domain,
 	}
 
 	/* Get UST channel if defined */
-	if (channel_name != '\0') {
+	if (channel_name[0] != '\0') {
 		uchan = trace_ust_find_channel_by_name(chan_ht, channel_name);
 		if (uchan == NULL) {
 			ret = LTTNG_ERR_UST_CHAN_NOT_FOUND;