X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fsrc%2Freducecap.c;h=824e7fd2f22e7abb4d65c24914f6472794220a92;hb=00d1011e5a6f311eca82159c2b994b0e5bd4b6d2;hp=bf56eb98b325662b1757ec23eea9b232dbad2938;hpb=dc713809dcc42829be150f067fe5285809fe0ef2;p=util-vserver.git diff --git a/util-vserver/src/reducecap.c b/util-vserver/src/reducecap.c index bf56eb9..824e7fd 100644 --- a/util-vserver/src/reducecap.c +++ b/util-vserver/src/reducecap.c @@ -32,14 +32,19 @@ #include #include -#include "linuxcaps.h" - #define ENSC_WRAPPERS_PREFIX "reducecap: " #define ENSC_WRAPPERS_VSERVER 1 #define ENSC_WRAPPERS_UNISTD 1 #include + // dirty hack... +#define __u32 uint32_t +#define __user +#include "linuxcaps.h" +#undef __user +#undef __u32 + #define CMD_HELP 0x1000 #define CMD_VERSION 0x1001 @@ -227,7 +232,9 @@ int main (int argc, char *argv[]) bool do_show = false; uint32_t flags = 0; pid_t pid = 0; +#ifdef VC_ENABLE_API_LEGACY bool show_obsolete_warning = true; +#endif while (1) { int c = getopt_long(argc, argv, "+", CMDLINE_OPTIONS, 0); @@ -247,18 +254,17 @@ int main (int argc, char *argv[]) switch (c) { case CMD_HELP : showHelp(1, argv[0], 0); case CMD_VERSION : showVersion(); - case CMD_SECURE : remove = vc_get_securecaps(); break; + case CMD_SECURE : remove = vc_get_insecurebcaps(); break; case CMD_SHOW : do_show = true; break; case CMD_PID : pid = atoi(optarg); break; case CMD_CAP : remove = getCap(optarg); break; case CMD_FLAG : { - char const *err_ptr; - size_t err_len; + struct vc_err_listparser err; - flags = vc_list2flag_compat(optarg, 0, &err_ptr, &err_len); - if (err_ptr!=0) { + flags = vc_list2cflag_compat(optarg, 0, &err); + if (err.ptr!=0) { WRITE_MSG(2, "Unknown flag '"); - write(2, err_ptr, err_len); + write(2, err.ptr, err.len); WRITE_MSG(2, "'\n"); exit(wrapper_exit_code); }