From: David Goulet Date: Thu, 26 Jun 2014 17:56:13 +0000 (-0400) Subject: Fix: accept override flag even without a load path X-Git-Tag: v2.5.0~30 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=e4b5eb8a2efd2fcfb031c8d14402f563dcb7f9ae;p=lttng-tools.git 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 --- 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;