X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconfig%2Fsession-config.c;h=c5432c392f884b58e38c84f7a0a59ed580dfa41e;hp=49c06a3531b874d734ac03659f8b09f14d1f0132;hb=db8196db8e8c41b5705ffd87a73e019289091880;hpb=594c7c002eda287de5f8c8e1859a8841f6fcc90f diff --git a/src/common/config/session-config.c b/src/common/config/session-config.c index 49c06a353..c5432c392 100644 --- a/src/common/config/session-config.c +++ b/src/common/config/session-config.c @@ -4017,16 +4017,17 @@ int config_load_session(const char *path, const char *session_name, /* Try home path */ home_path = utils_get_home_dir(); if (home_path) { - char path[PATH_MAX]; + char path_buf[PATH_MAX]; /* * Try user session configuration path. Ignore error here so we can * continue loading the system wide sessions. */ if (autoload) { - ret = snprintf(path, sizeof(path), - DEFAULT_SESSION_HOME_CONFIGPATH "/" - DEFAULT_SESSION_CONFIG_AUTOLOAD, home_path); + ret = snprintf(path_buf, sizeof(path_buf), + DEFAULT_SESSION_HOME_CONFIGPATH + "/" DEFAULT_SESSION_CONFIG_AUTOLOAD, + home_path); if (ret < 0) { PERROR("snprintf session autoload home config path"); ret = -LTTNG_ERR_INVALID; @@ -4038,19 +4039,20 @@ int config_load_session(const char *path, const char *session_name, * avoid any user session daemon to try to load kernel sessions * automatically and failing all the times. */ - ret = validate_path_creds(path); + ret = validate_path_creds(path_buf); if (ret) { - path_ptr = path; + path_ptr = path_buf; } } else { - ret = snprintf(path, sizeof(path), - DEFAULT_SESSION_HOME_CONFIGPATH, home_path); + ret = snprintf(path_buf, sizeof(path_buf), + DEFAULT_SESSION_HOME_CONFIGPATH, + home_path); if (ret < 0) { PERROR("snprintf session home config path"); ret = -LTTNG_ERR_INVALID; goto end; } - path_ptr = path; + path_ptr = path_buf; } if (path_ptr) { ret = load_session_from_path(path_ptr, session_name,