Fix: Deny session creation name 'auto'

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

diff --git a/src/bin/lttng/commands/create.c b/src/bin/lttng/commands/create.c
index 95a0a6ab37d541944bb3d29ad5ad4d945a2ab241..2c58075b4646cde144763ae30542608fa698eb4e 100644 (file)
--- a/src/bin/lttng/commands/create.c
+++ b/src/bin/lttng/commands/create.c
@@ -278,6 +278,14 @@ static int create_session(void)
                }
                DBG("Auto session name set to %s", session_name_date);
        } else {
+               if (strncmp(opt_session_name, DEFAULT_SESSION_NAME,
+                                       strlen(DEFAULT_SESSION_NAME)) == 0 &&
+                               strlen(opt_session_name) == strlen(DEFAULT_SESSION_NAME)) {
+                       ERR("%s is a reserved keyword for default session(s)",
+                                       DEFAULT_SESSION_NAME);
+                       ret = CMD_ERROR;
+                       goto error;
+               }
                session_name = opt_session_name;
                ret = snprintf(session_name_date, sizeof(session_name_date),
                                "%s-%s", session_name, datetime);
@@ -338,7 +346,7 @@ static int create_session(void)
        if (ret < 0) {
                /* Don't set ret so lttng can interpret the sessiond error. */
                switch (-ret) {
-               case LTTCOMM_EXIST_SESS:
+               case LTTNG_ERR_EXIST_SESS:
                        WARN("Session %s already exists", session_name);
                        break;
                }
@@ -399,6 +407,7 @@ error:
        if (traces_path) {
                free(traces_path);
        }
+       free(alloc_path);
 
        if (ret < 0) {
                ERR("%s", lttng_strerror(ret));