From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 16 Aug 2013 20:07:54 +0000 (-0400)
Subject: Fix: don't skip chmod if tracing group is not found
X-Git-Tag: v2.2.4~22
X-Git-Url: http://git.lttng.org/?a=commitdiff_plain;h=abec5852cca5158b808ff0cce55ed4ecc9b77b8d;hp=88de7b6ae349c83f85e7e92a9d7f3416620355e4;p=lttng-tools.git

Fix: don't skip chmod if tracing group is not found

Fixes #620

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index b42535c64..06a09fbb9 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -3953,12 +3953,12 @@ static int set_permissions(char *rundir)
 	ret = allowed_group();
 	if (ret < 0) {
 		WARN("No tracing group detected");
-		ret = 0;
-		goto end;
+		/* Setting gid to 0 if no tracing group is found */
+		gid = 0;
+	} else {
+		gid = ret;
 	}
 
-	gid = ret;
-
 	/* Set lttng run dir */
 	ret = chown(rundir, 0, gid);
 	if (ret < 0) {
@@ -3966,7 +3966,7 @@ static int set_permissions(char *rundir)
 		PERROR("chown");
 	}
 
-	/* Ensure tracing group can search the run dir */
+	/* Ensure all applications and tracing group can search the run dir */
 	ret = chmod(rundir, S_IRWXU | S_IXGRP | S_IXOTH);
 	if (ret < 0) {
 		ERR("Unable to set permissions on %s", rundir);
@@ -4003,7 +4003,6 @@ static int set_permissions(char *rundir)
 
 	DBG("All permissions are set");
 
-end:
 	return ret;
 }