From: David Goulet <dgoulet@efficios.com>
Date: Tue, 21 Feb 2012 22:46:49 +0000 (-0500)
Subject: Fix rest of the code to support compat layer
X-Git-Tag: v2.0.0-rc3~47
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=730389d9ab1a479e172ff3aaa0adf12580bb344c;p=lttng-tools.git

Fix rest of the code to support compat layer

Signed-off-by: David Goulet <dgoulet@efficios.com>
---

diff --git a/src/bin/lttng-sessiond/lttng-sessiond.h b/src/bin/lttng-sessiond/lttng-sessiond.h
index 2ba2550c7..79e7fcb43 100644
--- a/src/bin/lttng-sessiond/lttng-sessiond.h
+++ b/src/bin/lttng-sessiond/lttng-sessiond.h
@@ -24,6 +24,7 @@
 #include <urcu/wfqueue.h>
 
 #include <common/sessiond-comm/sessiond-comm.h>
+#include <common/compat/socket.h>
 
 #include "session.h"
 #include "ust-app.h"
@@ -42,10 +43,10 @@ extern const char default_home_dir[],
 struct command_ctx {
 	int ust_sock;
 	unsigned int lttng_msg_size;
-	struct ucred creds;
 	struct ltt_session *session;
 	struct lttcomm_lttng_msg *llm;
 	struct lttcomm_session_msg *lsm;
+	lttng_sock_cred creds;
 };
 
 struct ust_command {
diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 283868970..7dca8ad05 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>
@@ -295,14 +294,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");
+		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;
 }
@@ -2872,11 +2879,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;
 	}
@@ -3283,7 +3291,8 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 	 */
 	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;
 		}
@@ -3476,7 +3485,9 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 		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) {
@@ -3486,7 +3497,8 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 
 		/* 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();
 
@@ -3980,7 +3992,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;
 }
 
 /*
@@ -3988,7 +4017,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;
 }
 
 /*
diff --git a/src/bin/lttng/lttng.c b/src/bin/lttng/lttng.c
index 1349c20a7..16582b036 100644
--- a/src/bin/lttng/lttng.c
+++ b/src/bin/lttng/lttng.c
@@ -26,6 +26,7 @@
 #include <sys/wait.h>
 #include <unistd.h>
 #include <config.h>
+#include <ctype.h>
 
 #include <lttng/lttng.h>
 #include <common/error.h>
diff --git a/src/common/runas.c b/src/common/runas.c
index 07912a7d6..bee107951 100644
--- a/src/common/runas.c
+++ b/src/common/runas.c
@@ -28,9 +28,11 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sched.h>
-#include <sys/mman.h>
+#include <sys/signal.h>
 
 #include <common/error.h>
+#include <common/compat/mman.h>
+#include <common/compat/clone.h>
 
 #include "runas.h"