Fix: enable-channel accepts mismatched option

[lttng-tools.git] / src / bin / lttng / commands / enable_channels.c

diff --git a/src/bin/lttng/commands/enable_channels.c b/src/bin/lttng/commands/enable_channels.c
index d026af4337332ddfa08c05b3f912aa40085e9b18..f53a941a297358443bda9e18adf68d7de879ba86 100644 (file)
--- a/src/bin/lttng/commands/enable_channels.c
+++ b/src/bin/lttng/commands/enable_channels.c
@@ -179,11 +179,21 @@ static int enable_channel(char *session_name)
        if (opt_kernel) {
                dom.type = LTTNG_DOMAIN_KERNEL;
                dom.buf_type = LTTNG_BUFFER_GLOBAL;
+               if (opt_buffer_uid || opt_buffer_pid) {
+                       ERR("Buffer type not supported for domain -k");
+                       ret = CMD_ERROR;
+                       goto error;
+               }
        } else if (opt_userspace) {
                dom.type = LTTNG_DOMAIN_UST;
                if (opt_buffer_uid) {
                        dom.buf_type = LTTNG_BUFFER_PER_UID;
                } else {
+                       if (opt_buffer_global) {
+                               ERR("Buffer type not supported for domain -u");
+                               ret = CMD_ERROR;
+                               goto error;
+                       }
                        dom.buf_type = LTTNG_BUFFER_PER_PID;
                }
        } else {
@@ -238,7 +248,7 @@ static int enable_channel(char *session_name)
                        switch (-ret) {
                        case LTTNG_ERR_KERN_CHAN_EXIST:
                        case LTTNG_ERR_UST_CHAN_EXIST:
-                               WARN("Channel %s: %s (session %s", channel_name,
+                               WARN("Channel %s: %s (session %s)", channel_name,
                                                lttng_strerror(ret), session_name);
                                goto error;
                        default: