X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fenable_channels.c;h=696b8e0947ad20ca48e8b1ef3d5913d45b32f6c1;hb=394ff38e77d4510a4ff806eb187bf739e84561c6;hp=101617fa876be0b09464df81cd06e419f9ffb1a6;hpb=1f345e94095b14037b3f39bc0b48db6b6543efd6;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/enable_channels.c b/src/bin/lttng/commands/enable_channels.c
index 101617fa8..696b8e094 100644
--- a/src/bin/lttng/commands/enable_channels.c
+++ b/src/bin/lttng/commands/enable_channels.c
@@ -15,7 +15,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <popt.h>
 #include <stdio.h>
@@ -220,9 +219,8 @@ static int enable_channel(char *session_name)
 			dom.buf_type = LTTNG_BUFFER_PER_UID;
 		}
 	} else {
-		print_missing_domain();
-		ret = CMD_ERROR;
-		goto error;
+		/* Checked by the caller. */
+		assert(0);
 	}
 
 	set_default_attr(&dom);
@@ -382,6 +380,7 @@ static void init_channel_config(void)
 	 * those needed to be set by the default values.
 	 */
 	memset(&chan.attr, -1, sizeof(chan.attr));
+	chan.attr.extended.ptr = NULL;
 }
 
 /*
@@ -570,6 +569,12 @@ int cmd_enable_channels(int argc, const char **argv)
 		}
 	}
 
+	ret = print_missing_or_multiple_domains(opt_kernel + opt_userspace);
+	if (ret) {
+		ret = CMD_ERROR;
+		goto end;
+	}
+
 	/* Mi check */
 	if (lttng_opt_mi) {
 		writer = mi_lttng_writer_create(fileno(stdout), lttng_opt_mi);