From 0eaf076c2d3e75bacf00683fcc6312d65fe06169 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Thu, 27 Jan 2005 20:38:35 +0000 Subject: [PATCH] reworked the capability.h stuff git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1823 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/src/reducecap.c | 12 +++--------- util-vserver/src/vserver-info.c | 6 +++--- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/util-vserver/src/reducecap.c b/util-vserver/src/reducecap.c index 824e7fd..1dca269 100644 --- a/util-vserver/src/reducecap.c +++ b/util-vserver/src/reducecap.c @@ -38,12 +38,9 @@ #include - // dirty hack... -#define __u32 uint32_t -#define __user -#include "linuxcaps.h" -#undef __user -#undef __u32 +#undef _POSIX_SOURCE +#include "capability-compat.h" + #define CMD_HELP 0x1000 #define CMD_VERSION 0x1001 @@ -143,9 +140,6 @@ CMDLINE_OPTIONS[] = { int wrapper_exit_code = 255; -extern int capget (struct __user_cap_header_struct *, struct __user_cap_data_struct *); -extern int capset (struct __user_cap_header_struct *, struct __user_cap_data_struct *); - static void showHelp(int fd, char const *cmd, int res) { diff --git a/util-vserver/src/vserver-info.c b/util-vserver/src/vserver-info.c index 26f3d70..b500cd6 100644 --- a/util-vserver/src/vserver-info.c +++ b/util-vserver/src/vserver-info.c @@ -37,15 +37,15 @@ #include #include -#include - - #define ENSC_WRAPPERS_FCNTL 1 #define ENSC_WRAPPERS_IO 1 #define ENSC_WRAPPERS_UNISTD 1 #define ENSC_WRAPPERS_VSERVER 1 #include +#undef _POSIX_SOURCE +#include "capability-compat.h" + typedef enum { tgNONE,tgCONTEXT, tgID, tgRUNNING, tgVDIR, tgNAME, tgCFGDIR, tgAPPDIR, tgAPIVER, tgPXID, -- 1.8.1.5