X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng-sessiond%2Fmain.c;h=4828f1c179a914c87c5db77c2413cf9284536ed8;hp=a2532d0479463c6152c895efe90e5f8d3546080c;hb=c7704d570e2e8c713da4d045e7f7307b5b9818cb;hpb=b6ca8ef5adf433f7f0bbd4bb4858146ef25cd4fd diff --git a/lttng-sessiond/main.c b/lttng-sessiond/main.c index a2532d047..4828f1c17 100644 --- a/lttng-sessiond/main.c +++ b/lttng-sessiond/main.c @@ -1531,10 +1531,9 @@ static pid_t spawn_consumerd(struct consumer_data *consumer_data) switch (consumer_data->type) { case LTTNG_CONSUMER_KERNEL: /* - * Find out which consumerd to execute. We will - * first try the 64-bit path, then the - * sessiond's installation directory, and - * fallback on the 32-bit one, + * Find out which consumerd to execute. We will first try the + * 64-bit path, then the sessiond's installation directory, and + * fallback on the 32-bit one, */ DBG3("Looking for a kernel consumer at these locations:"); DBG3(" 1) %s", consumerd64_bin); @@ -1970,14 +1969,12 @@ error: } /* - * Check if the UID or GID match the session. Root user has access to - * all sessions. + * Check if the UID or GID match the session. Root user has access to all + * sessions. */ -static int session_access_ok(struct ltt_session *session, - uid_t uid, gid_t gid) +static int session_access_ok(struct ltt_session *session, uid_t uid, gid_t gid) { - if (uid != session->uid && gid != session->gid - && uid != 0) { + if (uid != session->uid && gid != session->gid && uid != 0) { return 0; } else { return 1; @@ -2010,8 +2007,8 @@ static unsigned int lttng_sessions_count(uid_t uid, gid_t gid) * The session list lock MUST be acquired before calling this function. Use * session_lock_list() and session_unlock_list(). */ -static void list_lttng_sessions(struct lttng_session *sessions, - uid_t uid, gid_t gid) +static void list_lttng_sessions(struct lttng_session *sessions, uid_t uid, + gid_t gid) { unsigned int i = 0; struct ltt_session *session;