From 883d970a45de63864c1b2ae956fc01e835e351c4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Wed, 19 Mar 2014 11:28:52 -0400 Subject: [PATCH] Fix: Pass session name to config_load_session when no path is provided MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fixes #756 Signed-off-by: Jérémie Galarneau Signed-off-by: David Goulet --- src/common/config/config.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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; } -- 2.34.1