Merge branch 'master' into compat-freebsd

[lttng-tools.git] / src / common / runas.c

diff --git a/src/common/runas.c b/src/common/runas.c
index cdc9cb79e604177467dd815992e12bdbe875e4f9..7dee28abedc6ce1f2d518e32a7d64d5c1a6cd3f4 100644 (file)
--- a/src/common/runas.c
+++ b/src/common/runas.c
@@ -38,8 +38,19 @@
 
 #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 {
@@ -227,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");