X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=12322837e7f681038e0ed6fe54d2ac72e035668d;hp=9e2b21b2dd417d7fc217f75de2293ff932f8b43c;hb=ca2eb7f43cf00d12f563905d741a6789c3d130ee;hpb=fc0c6bfbbe26b48832fad73c5a2ea9dd8c54c93b

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 9e2b21b2d..12322837e 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -17,7 +17,6 @@
  */
 
 #define _GNU_SOURCE
-#include <fcntl.h>
 #include <getopt.h>
 #include <grp.h>
 #include <limits.h>
@@ -40,6 +39,7 @@
 
 #include <common/common.h>
 #include <common/compat/poll.h>
+#include <common/compat/socket.h>
 #include <common/defaults.h>
 #include <common/kernel-consumer/kernel-consumer.h>
 #include <common/ust-consumer/ust-consumer.h>
@@ -301,14 +301,22 @@ static gid_t allowed_group(void)
  */
 static int init_thread_quit_pipe(void)
 {
-	int ret;
+	int ret, i;
 
-	ret = pipe2(thread_quit_pipe, O_CLOEXEC);
+	ret = pipe(thread_quit_pipe);
 	if (ret < 0) {
 		PERROR("thread quit pipe");
 		goto error;
 	}
 
+	for (i = 0; i < 2; i++) {
+		ret = fcntl(thread_quit_pipe[i], F_SETFD, FD_CLOEXEC);
+		if (ret < 0) {
+			PERROR("fcntl");
+			goto error;
+		}
+	}
+
 error:
 	return ret;
 }
@@ -2985,11 +2993,12 @@ error:
 /*
  * Command LTTNG_CREATE_SESSION processed by the client thread.
  */
-static int cmd_create_session(char *name, char *path, struct ucred *creds)
+static int cmd_create_session(char *name, char *path, lttng_sock_cred *creds)
 {
 	int ret;
 
-	ret = session_create(name, path, creds->uid, creds->gid);
+	ret = session_create(name, path, LTTNG_SOCK_GET_UID_CRED(creds),
+			LTTNG_SOCK_GET_GID_CRED(creds));
 	if (ret != LTTCOMM_OK) {
 		goto error;
 	}
@@ -3419,7 +3428,8 @@ skip_domain:
 	 */
 	if (need_tracing_session) {
 		if (!session_access_ok(cmd_ctx->session,
-				cmd_ctx->creds.uid, cmd_ctx->creds.gid)) {
+				LTTNG_SOCK_GET_UID_CRED(&cmd_ctx->creds),
+				LTTNG_SOCK_GET_GID_CRED(&cmd_ctx->creds))) {
 			ret = LTTCOMM_EPERM;
 			goto error;
 		}
@@ -3612,7 +3622,9 @@ skip_domain:
 		unsigned int nr_sessions;
 
 		session_lock_list();
-		nr_sessions = lttng_sessions_count(cmd_ctx->creds.uid, cmd_ctx->creds.gid);
+		nr_sessions = lttng_sessions_count(
+				LTTNG_SOCK_GET_UID_CRED(&cmd_ctx->creds),
+				LTTNG_SOCK_GET_GID_CRED(&cmd_ctx->creds));
 
 		ret = setup_lttng_msg(cmd_ctx, sizeof(struct lttng_session) * nr_sessions);
 		if (ret < 0) {
@@ -3622,7 +3634,8 @@ skip_domain:
 
 		/* Filled the session array */
 		list_lttng_sessions((struct lttng_session *)(cmd_ctx->llm->payload),
-			cmd_ctx->creds.uid, cmd_ctx->creds.gid);
+			LTTNG_SOCK_GET_UID_CRED(&cmd_ctx->creds),
+			LTTNG_SOCK_GET_GID_CRED(&cmd_ctx->creds));
 
 		session_unlock_list();
 
@@ -4142,7 +4155,24 @@ end:
  */
 static int create_kernel_poll_pipe(void)
 {
-	return pipe2(kernel_poll_pipe, O_CLOEXEC);
+	int ret, i;
+
+	ret = pipe(kernel_poll_pipe);
+	if (ret < 0) {
+		PERROR("kernel poll pipe");
+		goto error;
+	}
+
+	for (i = 0; i < 2; i++) {
+		ret = fcntl(kernel_poll_pipe[i], F_SETFD, FD_CLOEXEC);
+		if (ret < 0) {
+			PERROR("fcntl kernel_poll_pipe");
+			goto error;
+		}
+	}
+
+error:
+	return ret;
 }
 
 /*
@@ -4151,7 +4181,24 @@ static int create_kernel_poll_pipe(void)
  */
 static int create_apps_cmd_pipe(void)
 {
-	return pipe2(apps_cmd_pipe, O_CLOEXEC);
+	int ret, i;
+
+	ret = pipe(apps_cmd_pipe);
+	if (ret < 0) {
+		PERROR("apps cmd pipe");
+		goto error;
+	}
+
+	for (i = 0; i < 2; i++) {
+		ret = fcntl(apps_cmd_pipe[i], F_SETFD, FD_CLOEXEC);
+		if (ret < 0) {
+			PERROR("fcntl apps_cmd_pipe");
+			goto error;
+		}
+	}
+
+error:
+	return ret;
 }
 
 /*