projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: remote kernel stream paths contain too much information
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
main.c
diff --git
a/src/bin/lttng-sessiond/main.c
b/src/bin/lttng-sessiond/main.c
index 24855b9767632bc1584316b0b0c80362d870c2e5..ac7f7c910317d45158ac75991fa55cea17af7610 100644
(file)
--- a/
src/bin/lttng-sessiond/main.c
+++ b/
src/bin/lttng-sessiond/main.c
@@
-1023,7
+1023,11
@@
static int set_permissions(char *rundir)
int ret;
gid_t gid;
int ret;
gid_t gid;
- gid = utils_get_group_id(config.tracing_group_name.value);
+ ret = utils_get_group_id(config.tracing_group_name.value, true, &gid);
+ if (ret) {
+ /* Default to root group. */
+ gid = 0;
+ }
/* Set lttng run dir */
ret = chown(rundir, 0, gid);
/* Set lttng run dir */
ret = chown(rundir, 0, gid);
@@
-1134,7
+1138,16
@@
static int set_consumer_sockets(struct consumer_data *consumer_data)
goto error;
}
if (is_root) {
goto error;
}
if (is_root) {
- ret = chown(path, 0, utils_get_group_id(config.tracing_group_name.value));
+ gid_t gid;
+
+ ret = utils_get_group_id(config.tracing_group_name.value, true,
+ &gid);
+ if (ret) {
+ /* Default to root group. */
+ gid = 0;
+ }
+
+ ret = chown(path, 0, gid);
if (ret < 0) {
ERR("Unable to set group on %s", path);
PERROR("chown");
if (ret < 0) {
ERR("Unable to set group on %s", path);
PERROR("chown");
@@
-1322,8
+1335,8
@@
static void destroy_all_sessions_and_wait(void)
goto unlock_session;
}
(void) cmd_stop_trace(session);
goto unlock_session;
}
(void) cmd_stop_trace(session);
- (void) cmd_destroy_session(session,
-
notification_thread_handle
);
+ (void) cmd_destroy_session(session,
notification_thread_handle,
+
NULL
);
unlock_session:
session_unlock(session);
session_put(session);
unlock_session:
session_unlock(session);
session_put(session);
@@
-1356,6
+1369,14
@@
static int launch_run_as_worker(const char *procname)
&config);
}
&config);
}
+static void sessiond_uuid_log(void)
+{
+ char uuid_str[UUID_STR_LEN];
+
+ lttng_uuid_to_str(sessiond_uuid, uuid_str);
+ DBG("Starting lttng-sessiond {%s}", uuid_str);
+}
+
/*
* main
*/
/*
* main
*/
@@
-1452,6
+1473,7
@@
int main(int argc, char **argv)
set_clock_plugin_env();
sessiond_config_log(&config);
set_clock_plugin_env();
sessiond_config_log(&config);
+ sessiond_uuid_log();
if (create_lttng_rundir()) {
retval = -1;
if (create_lttng_rundir()) {
retval = -1;
This page took
0.026644 seconds
and
5
git commands to generate.