X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Frunas.c;h=7dee28abedc6ce1f2d518e32a7d64d5c1a6cd3f4;hp=745a6d0d13643d2333ee1bfe5c8b3e4c8fe4fb3b;hb=1d76b9222464f9e10128ae867cd56a9317da5d65;hpb=90755f8b59a2fe919cdf90f6f1ad89459f6b5ae2

diff --git a/src/common/runas.c b/src/common/runas.c
index 745a6d0d1..7dee28abe 100644
--- a/src/common/runas.c
+++ b/src/common/runas.c
@@ -28,16 +28,29 @@
 #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"
 
 #define RUNAS_CHILD_STACK_SIZE	10485760
 
-#ifndef MAP_STACK
-#define MAP_STACK		0
+#ifdef __FreeBSD__
+/* FreeBSD MAP_STACK always return -ENOMEM */
+#define LTTNG_MAP_STACK		0
+#else
+#define LTTNG_MAP_STACK		MAP_STACK
+#endif
+
+#ifndef MAP_GROWSDOWN
+#define MAP_GROWSDOWN		0
+#endif
+
+#ifndef MAP_ANONYMOUS
+#define MAP_ANONYMOUS		MAP_ANON
 #endif
 
 struct run_as_data {
@@ -225,7 +238,7 @@ int run_as(int (*cmd)(void *data), void *data, uid_t uid, gid_t gid)
 	run_as_data.retval_pipe = retval_pipe[1];	/* write end */
 	child_stack = mmap(NULL, RUNAS_CHILD_STACK_SIZE,
 		PROT_WRITE | PROT_READ,
-		MAP_PRIVATE | MAP_GROWSDOWN | MAP_ANONYMOUS | MAP_STACK,
+		MAP_PRIVATE | MAP_GROWSDOWN | MAP_ANONYMOUS | LTTNG_MAP_STACK,
 		-1, 0);
 	if (child_stack == MAP_FAILED) {
 		perror("mmap");
@@ -236,9 +249,8 @@ int run_as(int (*cmd)(void *data), void *data, uid_t uid, gid_t gid)
 	 * Pointing to the middle of the stack to support architectures
 	 * where the stack grows up (HPPA).
 	 */
-	pid = clone(child_run_as, child_stack + (RUNAS_CHILD_STACK_SIZE / 2),
-		CLONE_FILES | SIGCHLD,
-		&run_as_data, NULL);
+	pid = lttng_clone_files(child_run_as, child_stack + (RUNAS_CHILD_STACK_SIZE / 2),
+		&run_as_data);
 	if (pid < 0) {
 		perror("clone");
 		retval.i = pid;