X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconfig%2Fconfig.c;h=722904772316c0fc0b48f548817a472e051247a1;hb=b664f89a924cc708174003a2b570f5a221905b8e;hp=a890c9d872e1778875811c598cd448451a5ff793;hpb=54a9842323bdcf75da5f0e31a433191af7f687fd;p=lttng-tools.git

diff --git a/src/common/config/config.c b/src/common/config/config.c
index a890c9d87..722904772 100644
--- a/src/common/config/config.c
+++ b/src/common/config/config.c
@@ -1186,9 +1186,6 @@ int create_session(const char *name,
 	xmlNodePtr consumer_output_node;
 
 	assert(name);
-	assert(kernel_domain);
-	assert(ust_domain);
-	assert(jul_domain);
 
 	if (output_node) {
 		consumer_output_node = xmlFirstElementChild(output_node);
@@ -1225,11 +1222,12 @@ int create_session(const char *name,
 
 		/* network destination */
 		if (live_timer_interval && live_timer_interval != UINT64_MAX) {
-			const char *url = output.control_uri ?
-				output.control_uri : output.data_uri;
-
-			/* URL has to be provided, even if we'll overwrite it after. */
-			ret = lttng_create_session_live(name, url, live_timer_interval);
+			/*
+			 * URLs are provided for sure since the test above make sure that
+			 * with a live timer the data and control URIs are provided. So,
+			 * NULL is passed here and will be set right after.
+			 */
+			ret = lttng_create_session_live(name, NULL, live_timer_interval);
 		} else {
 			ret = lttng_create_session(name, NULL);
 		}
@@ -2459,9 +2457,10 @@ int config_load_session(const char *path, const char *session_name,
 				goto end;
 			}
 
-			ret = load_session_from_path(path, NULL,
+			ret = load_session_from_path(path, session_name,
 				&validation_ctx, 0);
-			if (ret && ret != -LTTNG_ERR_LOAD_SESSION_NOENT) {
+			if (!ret || (ret && ret != -LTTNG_ERR_LOAD_SESSION_NOENT)) {
+				/* Session found or an error occured */
 				free(path);
 				goto end;
 			}
@@ -2470,9 +2469,10 @@ int config_load_session(const char *path, const char *session_name,
 		}
 
 		/* Try system session configuration path */
-		ret = load_session_from_path(DEFAULT_SESSION_SYSTEM_CONFIGPATH, NULL,
-				&validation_ctx, 0);
-		if (ret && ret != -LTTNG_ERR_LOAD_SESSION_NOENT) {
+		ret = load_session_from_path(DEFAULT_SESSION_SYSTEM_CONFIGPATH,
+			session_name, &validation_ctx, 0);
+		if (!ret || (ret && ret != -LTTNG_ERR_LOAD_SESSION_NOENT)) {
+			/* Session found or an error occured */
 			goto end;
 		}
 	} else {