From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Wed, 19 Mar 2014 15:28:52 +0000 (-0400)
Subject: Fix: Pass session name to config_load_session when no path is provided
X-Git-Tag: v2.5.0-rc1~103
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=883d970a45de63864c1b2ae956fc01e835e351c4;p=lttng-tools.git

Fix: Pass session name to config_load_session when no path is provided

Fixes #756

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Signed-off-by: David Goulet <dgoulet@efficios.com>
---

diff --git a/src/common/config/config.c b/src/common/config/config.c
index 13af2f117..7c6c49b66 100644
--- a/src/common/config/config.c
+++ b/src/common/config/config.c
@@ -2456,7 +2456,7 @@ 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) {
 				free(path);
@@ -2467,8 +2467,8 @@ 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);
+		ret = load_session_from_path(DEFAULT_SESSION_SYSTEM_CONFIGPATH,
+			session_name, &validation_ctx, 0);
 		if (ret && ret != -LTTNG_ERR_LOAD_SESSION_NOENT) {
 			goto end;
 		}