Rename "global" sock_info field to "multi_user"

[lttng-ust.git] / src / lib / lttng-ust / lttng-ust-comm.c

diff --git a/src/lib/lttng-ust/lttng-ust-comm.c b/src/lib/lttng-ust/lttng-ust-comm.c
index e206456f0d98060ea20c2310c4f993c1d6494ece..ccf2a9b816e00920f92850a927bbdf6205c944b6 100644 (file)
--- a/src/lib/lttng-ust/lttng-ust-comm.c
+++ b/src/lib/lttng-ust/lttng-ust-comm.c
@@ -257,7 +257,7 @@ struct sock_info {
        int root_handle;
        int registration_done;
        int allowed;
-       int global;
+       bool multi_user;
        int thread_active;
 
        char sock_path[PATH_MAX];
@@ -276,7 +276,7 @@ struct sock_info {
 /* Socket from app (connect) to session daemon (listen) for communication */
 static struct sock_info global_apps = {
        .name = "global",
-       .global = 1,
+       .multi_user = true,
 
        .root_handle = -1,
        .registration_done = 0,
@@ -298,7 +298,7 @@ static struct sock_info global_apps = {
 
 static struct sock_info local_apps = {
        .name = "local",
-       .global = 0,
+       .multi_user = false,
        .root_handle = -1,
        .registration_done = 0,
        .allowed = 0,   /* Check setuid bit first */
@@ -370,26 +370,16 @@ static char *get_map_shm(struct sock_info *sock_info);
 /*
  * Returns the HOME directory path. Caller MUST NOT free(3) the returned
  * pointer.
- * The following env are checked in order of priority:
- *  1 - LTTNG_UST_HOME
- *  2 - LTTNG_HOME
- *  3 - HOME
  */
 static
 const char *get_lttng_home_dir(void)
 {
        const char *val;
 
-       val = (const char *) lttng_ust_getenv("LTTNG_UST_HOME");
-       if (val != NULL) {
-               return val;
-       }
-
        val = (const char *) lttng_ust_getenv("LTTNG_HOME");
        if (val != NULL) {
                return val;
        }
-
        return (const char *) lttng_ust_getenv("HOME");
 }
 
@@ -1623,7 +1613,7 @@ open_write:
 
                /* Child */
                create_mode = S_IRUSR | S_IWUSR | S_IRGRP;
-               if (sock_info->global)
+               if (sock_info->multi_user)
                        create_mode |= S_IROTH | S_IWGRP | S_IWOTH;
                /*
                 * We're alone in a child process, so we can modify the
@@ -1653,7 +1643,7 @@ open_write:
                 * sessiond will be able to override all rights and wake
                 * us up.
                 */
-               if (!sock_info->global && errno != EACCES) {
+               if (!sock_info->multi_user && errno != EACCES) {
                        ERR("Error opening shm %s", sock_info->wait_shm_path);
                        _exit(EXIT_FAILURE);
                }
@@ -1666,7 +1656,7 @@ open_write:
                return -1;
        }
 end:
-       if (wait_shm_fd >= 0 && !sock_info->global) {
+       if (wait_shm_fd >= 0 && !sock_info->multi_user) {
                struct stat statbuf;
 
                /*