X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fcreate.c;h=b14b45cd6e1fd31435612590f34e8e07d3f97a28;hb=4b861950d3e6782fbcc6a3f85855d0c1ef58c1f4;hp=491ffd548ae6deb11c149f5819b572e98981052c;hpb=23d14dff22683582847cde7ed416a5aeb90e3bd9;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/create.c b/src/bin/lttng/commands/create.c
index 491ffd548..b14b45cd6 100644
--- a/src/bin/lttng/commands/create.c
+++ b/src/bin/lttng/commands/create.c
@@ -209,9 +209,16 @@ static int create_session(void)
 			ret = LTTNG_ERR_SESSION_FAIL;
 			goto error;
 		}
-		if (strncmp(opt_session_name, DEFAULT_SESSION_NAME,
+		/*
+		 * Check if the session name begins with "auto-" or is exactly "auto".
+		 * Both are reserved for the default session name. See bug #449 to
+		 * understand why we need to check both here.
+		 */
+		if ((strncmp(opt_session_name, DEFAULT_SESSION_NAME "-",
+					strlen(DEFAULT_SESSION_NAME) + 1) == 0) ||
+				(strncmp(opt_session_name, DEFAULT_SESSION_NAME,
 					strlen(DEFAULT_SESSION_NAME)) == 0 &&
-				strlen(opt_session_name) == strlen(DEFAULT_SESSION_NAME)) {
+				strlen(opt_session_name) == strlen(DEFAULT_SESSION_NAME))) {
 			ERR("%s is a reserved keyword for default session(s)",
 					DEFAULT_SESSION_NAME);
 			ret = CMD_ERROR;
@@ -279,6 +286,9 @@ static int create_session(void)
 		case LTTNG_ERR_EXIST_SESS:
 			WARN("Session %s already exists", session_name);
 			break;
+		default:
+			ERR("%s", lttng_strerror(ret));
+			break;
 		}
 		goto error;
 	}