X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconfig%2Fsession-config.c;h=b2d7a6b5b149f6f0adb5f6e775d10bb383b901ac;hb=21a3f1441e53c1239d3e8cdd1bf4f08531beb83e;hp=adb49bd08ee94b68c9cea8ef46b93b9d93898a15;hpb=1b08cbce538eedab5682d174c012903d128c216f;p=lttng-tools.git

diff --git a/src/common/config/session-config.c b/src/common/config/session-config.c
index adb49bd08..b2d7a6b5b 100644
--- a/src/common/config/session-config.c
+++ b/src/common/config/session-config.c
@@ -1257,24 +1257,28 @@ int create_snapshot_session(const char *session_name, xmlNodePtr output_node,
 			}
 		}
 
+		control_uri = output.control_uri;
+		data_uri = output.data_uri;
+		path = output.path;
+
 		if (overrides) {
 			if (overrides->path_url) {
-				/* Control/data_uri are null */
 				path = overrides->path_url;
+				/* Control/data_uri are null */
+				control_uri = NULL;
+				data_uri = NULL;
 			} else {
 				if (overrides->ctrl_url) {
-					/* path is null */
 					control_uri = overrides->ctrl_url;
+					/* path is null */
+					path = NULL;
 				}
 				if (overrides->data_url) {
-					/* path is null */
 					data_uri = overrides->data_url;
+					/* path is null */
+					path = NULL;
 				}
 			}
-		} else {
-			control_uri = output.control_uri;
-			data_uri = output.data_uri;
-			path = output.path;
 		}
 
 		snapshot_output = lttng_snapshot_output_create();
@@ -1372,27 +1376,32 @@ int create_session(const char *name,
 		}
 	}
 
+	control_uri = output.control_uri;
+	data_uri = output.data_uri;
+	path = output.path;
+
 	/* Check for override and apply them */
 	if (overrides) {
 		if (overrides->path_url) {
-			/* control/data_uri are null */;
 			path = overrides->path_url;
+			/* control/data_uri are null */;
+			control_uri = NULL;
+			data_uri = NULL;
 		} else {
 			if (overrides->ctrl_url) {
-				/* path is null */
 				control_uri = overrides->ctrl_url;
+				/* path is null */
+				path = NULL;
 			}
 			if (overrides->data_url) {
-				/* path is null */
 				data_uri = overrides->data_url;
+				/* path is null */
+				path = NULL;
 			}
 		}
-	} else {
-		control_uri = output.control_uri;
-		data_uri = output.data_uri;
-		path = output.path;
 	}
 
+
 	if (live_timer_interval != UINT64_MAX && !control_uri && !data_uri) {
 		ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
 		goto end;
@@ -2618,6 +2627,21 @@ domain_init_error:
 		goto error;
 	}
 
+	/* Apply overrides */
+	if (overrides) {
+		if (overrides->session_name) {
+			xmlChar *name_override = xmlStrdup(BAD_CAST(overrides->session_name));
+			if (!name_override) {
+				ret = -LTTNG_ERR_NOMEM;
+				goto error;
+			}
+
+			/* Overrides the session name to the provided name */
+			xmlFree(name);
+			name = name_override;
+		}
+	}
+
 	if (overwrite) {
 		/* Destroy session if it exists */
 		ret = lttng_destroy_session((const char *) name);