X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fcreate.c;h=08b12a46eee2b95e6093f738a97a5b0f01936551;hb=94e60b1f03ae2c3c9450ffc3eca8e052e2c37fb4;hp=95a0a6ab37d541944bb3d29ad5ad4d945a2ab241;hpb=40b03f52807cb22b37d0522084d407cfad5f12c2;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/create.c b/src/bin/lttng/commands/create.c
index 95a0a6ab3..08b12a46e 100644
--- a/src/bin/lttng/commands/create.c
+++ b/src/bin/lttng/commands/create.c
@@ -271,13 +271,17 @@ static int create_session(void)
 			PERROR("snprintf session name");
 			goto error;
 		}
-		session_name = strdup(DEFAULT_SESSION_NAME);
-		if (session_name == NULL) {
-			PERROR("strdup session name");
-			goto error;
-		}
+		session_name = session_name_date;
 		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,18 +342,14 @@ 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;
 		}
 		goto error;
 	}
 
-	if (opt_session_name == NULL) {
-		MSG("Session %s created.", session_name_date);
-	} else {
-		MSG("Session %s created.", session_name);
-	}
+	MSG("Session %s created.", session_name);
 	MSG("Traces will be written in %s", print_str_url);
 
 	if (opt_ctrl_url || opt_data_url) {
@@ -372,11 +372,6 @@ static int create_session(void)
 		}
 	}
 
-	if (opt_session_name == NULL) {
-		free(session_name);
-		session_name = session_name_date;
-	}
-
 	/* Init lttng session config */
 	ret = config_init(session_name);
 	if (ret < 0) {
@@ -388,10 +383,6 @@ static int create_session(void)
 	ret = CMD_SUCCESS;
 
 error:
-	if (opt_session_name == NULL && session_name != session_name_date) {
-		free(session_name);
-	}
-
 	if (alloc_url) {
 		free(alloc_url);
 	}
@@ -399,6 +390,7 @@ error:
 	if (traces_path) {
 		free(traces_path);
 	}
+	free(alloc_path);
 
 	if (ret < 0) {
 		ERR("%s", lttng_strerror(ret));