From 5252df626db3d88190b6fa67d7ee712e4500c4e4 Mon Sep 17 00:00:00 2001 From: David Goulet Date: Thu, 26 Jun 2014 13:56:13 -0400 Subject: [PATCH] Fix: accept override flag even without a load path Part of the bug #807 have been fixed also by the previous commit. Fixes #807 Signed-off-by: David Goulet --- src/common/config/config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/config/config.c b/src/common/config/config.c index 39cd57bd2..c9777d63f 100644 --- a/src/common/config/config.c +++ b/src/common/config/config.c @@ -2529,7 +2529,7 @@ int config_load_session(const char *path, const char *session_name, } ret = load_session_from_path(path, session_name, - &validation_ctx, 0); + &validation_ctx, override); if (!ret || (ret && ret != -LTTNG_ERR_LOAD_SESSION_NOENT)) { /* Session found or an error occured */ free(path); @@ -2541,7 +2541,7 @@ 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, - session_name, &validation_ctx, 0); + session_name, &validation_ctx, override); if (!ret || (ret && ret != -LTTNG_ERR_LOAD_SESSION_NOENT)) { /* Session found or an error occured */ goto end; -- 2.34.1