From: David Goulet <dgoulet@efficios.com>
Date: Fri, 17 Aug 2012 19:23:09 +0000 (-0400)
Subject: Fix: UST app major version check
X-Git-Tag: v2.1.0-rc1~3
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=aee0cea039d432fc5f5186dfaf102074562591e1;p=lttng-tools.git

Fix: UST app major version check

Makes a direct match between the major version of the application and
the one supported by lttng-tools (==).

Note that this version numbering is an internal scheme between UST and
lttng-tools. It has no link whatsoever with the public version of the
toolchain.

The 2.1.0-rc1 release commit will make sure this version corresponds to
the UST rc1.

CC: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: David Goulet <dgoulet@efficios.com>
---

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index e5d8b5707..7f4e9f1e0 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -2921,12 +2921,12 @@ int ust_app_validate_version(int sock)
 	}
 
 	/* Validate version */
-	if (app->version.major > UST_APP_MAJOR_VERSION) {
+	if (app->version.major != UST_APP_MAJOR_VERSION) {
 		goto error;
 	}
 
 	DBG2("UST app PID %d is compatible with major version %d "
-			"(supporting <= %d)", app->pid, app->version.major,
+			"(supporting == %d)", app->pid, app->version.major,
 			UST_APP_MAJOR_VERSION);
 	app->compatible = 1;
 	rcu_read_unlock();
@@ -2935,7 +2935,7 @@ int ust_app_validate_version(int sock)
 
 error:
 	DBG2("UST app PID %d is not compatible with major version %d "
-			"(supporting <= %d)", app->pid, app->version.major,
+			"(supporting == %d)", app->pid, app->version.major,
 			UST_APP_MAJOR_VERSION);
 	app->compatible = 0;
 	rcu_read_unlock();