From c91280a4bd738eba0f19c8d3714da2f319dcd602 Mon Sep 17 00:00:00 2001 From: Eric W. Biederman Date: Wed, 16 Jan 2013 16:36:32 -0800 Subject: unshare,nsenter: Move the old libc handling into a common header namespace.h Move the defitions of CLONE_NEWNS, CLONE_NEWUTS, CLONE_NEWIPC, CLONE_NEWNET, CLONE_NEWUSER, CLONE_NEWPID into namespace.h in case sched.h does not provide those definitions. Are there systems around that are old enough that still need this? Move the definitions of unshare() and setns() into namespace.h for supporting old versions of libc that does not provice these. I have tested this support with setns as I still have systems old enough that glibc does not wrap setns. Signed-off-by: "Eric W. Biederman" --- sys-utils/nsenter.c | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) (limited to 'sys-utils/nsenter.c') diff --git a/sys-utils/nsenter.c b/sys-utils/nsenter.c index 99b18b05f..0b5d17da7 100644 --- a/sys-utils/nsenter.c +++ b/sys-utils/nsenter.c @@ -31,33 +31,7 @@ #include "nls.h" #include "c.h" #include "closestream.h" - -#ifndef CLONE_NEWSNS -# define CLONE_NEWNS 0x00020000 -#endif -#ifndef CLONE_NEWUTS -# define CLONE_NEWUTS 0x04000000 -#endif -#ifndef CLONE_NEWIPC -# define CLONE_NEWIPC 0x08000000 -#endif -#ifndef CLONE_NEWNET -# define CLONE_NEWNET 0x40000000 -#endif -#ifndef CLONE_NEWUSER -# define CLONE_NEWUSER 0x10000000 -#endif -#ifndef CLONE_NEWPID -# define CLONE_NEWPID 0x20000000 -#endif - -#ifndef HAVE_SETNS -# include -static int setns(int fd, int nstype) -{ - return syscall(SYS_setns, fd, nstype); -} -#endif /* HAVE_SETNS */ +#include "namespace.h" static struct namespace_file{ int nstype; -- cgit v1.2.3-55-g7522