Fix: accept override flag even without a load path
authorDavid Goulet <dgoulet@efficios.com>
Thu, 26 Jun 2014 17:56:13 +0000 (13:56 -0400)
committerDavid Goulet <dgoulet@efficios.com>
Thu, 26 Jun 2014 17:57:41 +0000 (13:57 -0400)
Part of the bug #807 have been fixed also by the previous commit.

Fixes #807

Signed-off-by: David Goulet <dgoulet@efficios.com>
src/common/config/config.c

index 39cd57bd26038d0dd159b187440676ce836aa50d..c9777d63f673728313c9f1d0fb0d8cc783e6af21 100644 (file)
@@ -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;
This page took 0.02901 seconds and 4 git commands to generate.