X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=af0a51b8891d1ad952c2324786798acf6a2f0fdf;hb=f73fabfda365d22e7dd180fb1614e37c446fbd9e;hp=7f4e9f1e0c928df31c5b5a39b1614e54f22361f8;hpb=aee0cea039d432fc5f5186dfaf102074562591e1;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 7f4e9f1e0..af0a51b88 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -2196,6 +2196,7 @@ int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app)
 
 	ret = create_ust_app_metadata(ua_sess, usess->pathname, app);
 	if (ret < 0) {
+		ret = LTTNG_ERR_UST_META_FAIL;
 		goto error_rcu_unlock;
 	}
 
@@ -2227,6 +2228,7 @@ int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app)
 				/* Got all streams */
 				lttng_fd_put(LTTNG_FD_APPS, 2);
 				free(ustream);
+				ret = LTTNG_ERR_UST_STREAM_FAIL;
 				break;
 			}
 			ustream->handle = ustream->obj->handle;
@@ -2925,7 +2927,7 @@ int ust_app_validate_version(int sock)
 		goto error;
 	}
 
-	DBG2("UST app PID %d is compatible with major version %d "
+	DBG2("UST app PID %d is compatible with internal major version %d "
 			"(supporting == %d)", app->pid, app->version.major,
 			UST_APP_MAJOR_VERSION);
 	app->compatible = 1;
@@ -2934,7 +2936,7 @@ int ust_app_validate_version(int sock)
 	return 0;
 
 error:
-	DBG2("UST app PID %d is not compatible with major version %d "
+	DBG2("UST app PID %d is not compatible with internal major version %d "
 			"(supporting == %d)", app->pid, app->version.major,
 			UST_APP_MAJOR_VERSION);
 	app->compatible = 0;