X-Git-Url: http://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=d735be833f4064e88d0cd801a45c6d781d618c55;hp=d29de9d459fd6b3fbd0325ecf04111fbbbf10aae;hb=c119cdb1e4cf3e0fd5080160a5c4286cd7391714;hpb=6179b377e769efa1541f98db56573519b787e858

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index d29de9d45..d735be833 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -3226,6 +3226,9 @@ static ssize_t cmd_list_channels(int domain, struct ltt_session *session,
 			nb_chan = session->kernel_session->channel_count;
 		}
 		DBG3("Number of kernel channels %zd", nb_chan);
+		if (nb_chan <= 0) {
+			ret = LTTCOMM_KERN_CHAN_NOT_FOUND;
+		}
 		break;
 	case LTTNG_DOMAIN_UST:
 		if (session->ust_session != NULL) {
@@ -3233,6 +3236,9 @@ static ssize_t cmd_list_channels(int domain, struct ltt_session *session,
 					session->ust_session->domain_global.channels);
 		}
 		DBG3("Number of UST global channels %zd", nb_chan);
+		if (nb_chan <= 0) {
+			ret = LTTCOMM_UST_CHAN_NOT_FOUND;
+		}
 		break;
 	default:
 		*channels = NULL;
@@ -3250,6 +3256,8 @@ static ssize_t cmd_list_channels(int domain, struct ltt_session *session,
 		list_lttng_channels(domain, session, *channels);
 	} else {
 		*channels = NULL;
+		/* Ret value was set in the domain switch case */
+		goto error;
 	}
 
 	return nb_chan;