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 13af2f117e7bf7306cdab4930d45a711da5312ab..7c6c49b6661a5b7353b0b2aecf67926938a5bdb6 100644 (file)
--- 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;
                        }
 
                                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);
                                &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 */
                }
 
                /* 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;
                }
                if (ret && ret != -LTTNG_ERR_LOAD_SESSION_NOENT) {
                        goto end;
                }