From 8b0f459af7aa108089d0f87b0be81ccadb8638cb Mon Sep 17 00:00:00 2001
From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Sat, 2 Apr 2016 19:00:44 +0200
Subject: nsenter,unshare: work around older header

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---
 util-linux/nsenter.c | 16 ++++++++++++++++
 util-linux/unshare.c | 29 +++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)

(limited to 'util-linux')

diff --git a/util-linux/nsenter.c b/util-linux/nsenter.c
index 0dad595cd..b08b3dae7 100644
--- a/util-linux/nsenter.c
+++ b/util-linux/nsenter.c
@@ -60,6 +60,22 @@
 //usage:#endif
 
 #include <sched.h>
+#ifndef CLONE_NEWUTS
+# define CLONE_NEWUTS  0x04000000
+#endif
+#ifndef CLONE_NEWIPC
+# define CLONE_NEWIPC  0x08000000
+#endif
+#ifndef CLONE_NEWUSER
+# define CLONE_NEWUSER 0x10000000
+#endif
+#ifndef CLONE_NEWPID
+# define CLONE_NEWPID  0x20000000
+#endif
+#ifndef CLONE_NEWNET
+# define CLONE_NEWNET  0x40000000
+#endif
+
 #include "libbb.h"
 
 struct namespace_descr {
diff --git a/util-linux/unshare.c b/util-linux/unshare.c
index 95a7cb647..d05cfdb6c 100644
--- a/util-linux/unshare.c
+++ b/util-linux/unshare.c
@@ -40,7 +40,36 @@
 //usage:     "\n	--setgroups allow|deny	Control the setgroups syscall in user namespaces"
 
 #include <sched.h>
+#ifndef CLONE_NEWUTS
+# define CLONE_NEWUTS  0x04000000
+#endif
+#ifndef CLONE_NEWIPC
+# define CLONE_NEWIPC  0x08000000
+#endif
+#ifndef CLONE_NEWUSER
+# define CLONE_NEWUSER 0x10000000
+#endif
+#ifndef CLONE_NEWPID
+# define CLONE_NEWPID  0x20000000
+#endif
+#ifndef CLONE_NEWNET
+# define CLONE_NEWNET  0x40000000
+#endif
+
 #include <sys/mount.h>
+#ifndef MS_REC
+# define MS_REC     (1 << 14)
+#endif
+#ifndef MS_PRIVATE
+# define MS_PRIVATE (1 << 18)
+#endif
+#ifndef MS_SLAVE
+# define MS_SLAVE   (1 << 19)
+#endif
+#ifndef MS_SHARED
+# define MS_SHARED  (1 << 20)
+#endif
+
 #include "libbb.h"
 
 static void mount_or_die(const char *source, const char *target,
-- 
cgit v1.2.3