X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fsrc%2Freducecap.c;h=01a9872dc2ba5e1fd61955bbeed150840609c27b;hb=a917f24ef7b003dcef54a3db2644cf9cb4bc2db2;hp=caf64078459f1ed1092e4bb12df5c4a87086961c;hpb=db50e38ac7dba2609f956a919f132cf446f9464f;p=util-vserver.git diff --git a/util-vserver/src/reducecap.c b/util-vserver/src/reducecap.c index caf6407..01a9872 100644 --- a/util-vserver/src/reducecap.c +++ b/util-vserver/src/reducecap.c @@ -34,6 +34,7 @@ #include "linuxcaps.h" +#define ENSC_WRAPPERS_PREFIX "reducecap: " #define ENSC_WRAPPERS_VSERVER 1 #define ENSC_WRAPPERS_UNISTD 1 #include @@ -199,7 +200,7 @@ show(pid_t pid) header.version = _LINUX_CAPABILITY_VERSION; header.pid = pid; if (capget(&header,&user)==-1){ - perror ("capget"); + perror ("reducecap: capget()"); exit(wrapper_exit_code); } @@ -246,18 +247,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_insecurecaps(); 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_textlist2flag(optarg, 0, &err_ptr, &err_len); - if (err_ptr!=0) { + flags = vc_list2flag_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); }