X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fsrc%2Fvattribute.c;h=a20c0e6c3a730a5627f8f30f281de126caa2b128;hb=b200c0071dac48ca1576123c8fd3d72052425127;hp=566125b9a3e7e5607ac883cd5567b5f84d0ba1b0;hpb=2ba5573d94d416d1b49dd9d0b40211df36a53ded;p=util-vserver.git diff --git a/util-vserver/src/vattribute.c b/util-vserver/src/vattribute.c index 566125b..a20c0e6 100644 --- a/util-vserver/src/vattribute.c +++ b/util-vserver/src/vattribute.c @@ -95,11 +95,11 @@ parseFlags(char const *str, struct vc_ctx_flags *flags) struct vc_err_listparser err; int rc; - rc = vc_list2flag(str,0, &err, flags); + rc = vc_list2cflag(str,0, &err, flags); if (rc==-1) { 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); } @@ -115,7 +115,7 @@ parseBCaps(char const *str, struct vc_ctx_caps *caps) if (rc==-1) { WRITE_MSG(2, "Unknown bcap '"); - write(2, err.ptr, err.len); + Vwrite(2, err.ptr, err.len); WRITE_MSG(2, "'\n"); exit(wrapper_exit_code); } @@ -131,7 +131,7 @@ parseCCaps(char const *str, struct vc_ctx_caps *caps) if (rc==-1) { WRITE_MSG(2, "Unknown ccap '"); - write(2, err.ptr, err.len); + Vwrite(2, err.ptr, err.len); WRITE_MSG(2, "'\n"); exit(wrapper_exit_code); } @@ -141,10 +141,14 @@ static void parseSecure(struct vc_ctx_flags UNUSED * flags, struct vc_ctx_caps UNUSED * caps) { - caps->ccaps = ~0ull; + caps->ccaps = ~vc_get_insecureccaps(); caps->cmask = ~0ull; - caps->bcaps = ~vc_get_insecurecaps(); + caps->bcaps = ~vc_get_insecurebcaps(); caps->bmask = ~0ull; + + // TODO: generalize this + flags->flagword = VC_VXF_HIDE_NETIF; + flags->mask = VC_VXF_HIDE_NETIF; } int main(int argc, char *argv[]) @@ -183,7 +187,7 @@ int main(int argc, char *argv[]) vc_set_ccaps(args.xid, &args.caps)==-1) perror(ENSC_WRAPPERS_PREFIX "vc_set_ccaps()"); else if (args.flags.mask && - vc_set_flags(args.xid, &args.flags)==-1) + vc_set_cflags(args.xid, &args.flags)==-1) perror(ENSC_WRAPPERS_PREFIX "vc_set_flags()"); else if (optind