X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fsrc%2Fchcontext.c;h=0e0ae484b119d2035efbb2e4292056376748b763;hb=247c887319ab56129d3dbd730c8d1ac8602ef215;hp=9c03445d77ee3bcaa053c3d9239773242d7c8496;hpb=f242c493e4feccf2bef4ad10ce8d64c2e3ecc56e;p=util-vserver.git diff --git a/util-vserver/src/chcontext.c b/util-vserver/src/chcontext.c index 9c03445..0e0ae48 100644 --- a/util-vserver/src/chcontext.c +++ b/util-vserver/src/chcontext.c @@ -40,6 +40,7 @@ #include #include #include +#include #define ENSC_WRAPPERS_PREFIX "chcontext: " #define ENSC_WRAPPERS_VSERVER 1 @@ -206,11 +207,11 @@ setFlags(char const *str, uint32_t *flags) { struct vc_err_listparser err; - *flags = vc_list2flag_compat(str, 0, &err); + *flags = vc_list2cflag_compat(str, 0, &err); if (err.ptr!=0) { WRITE_MSG(2, "Unknown flag '"); - write(2, err.ptr, err.len); + Vwrite(2, err.ptr, err.len); WRITE_MSG(2, "'\n"); exit(wrapper_exit_code); } @@ -259,7 +260,7 @@ tellContext(xid_t ctx) l = utilvserver_fmt_long(buf,ctx); WRITE_MSG(1, "New security context is "); - write(1, buf, l); + Vwrite(1, buf, l); WRITE_MSG(1, "\n"); } @@ -283,7 +284,8 @@ int main (int argc, char *argv[]) pid_t pid; global_args = &args; - + signal(SIGCHLD, SIG_DFL); + while (1) { int c = getopt_long(argc, argv, "+", CMDLINE_OPTIONS, 0); if (c==-1) break; @@ -300,7 +302,7 @@ int main (int argc, char *argv[]) setCap(optarg, &args.add_caps, &args.remove_caps); break; case CMD_SECURE : - args.remove_caps |= vc_get_securecaps(); + args.remove_caps |= vc_get_insecurebcaps(); break; case CMD_FLAG : setFlags(optarg, &args.flags);