From: David Goulet <dgoulet@efficios.com>
Date: Mon, 25 Mar 2013 20:30:12 +0000 (-0400)
Subject: Fix: lttng create default name check
X-Git-Tag: v2.2.0-rc1~25
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=4b861950d3e6782fbcc6a3f85855d0c1ef58c1f4

Fix: lttng create default name check

Fixes #449

Signed-off-by: David Goulet <dgoulet@efficios.com>
---

diff --git a/src/bin/lttng/commands/create.c b/src/bin/lttng/commands/create.c
index ee51806ff..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;