X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fccaps-v13.c;h=d0045b07bdd58624a349d911008d9c3659fd2985;hb=08c25ff5102e38cd861f267c7702981629f736fd;hp=7d457e7dc8ab15cb65cd5a05db61a45a53b1b8ee;hpb=ff718f99578c633a0526486eec9672e75ba8325b;p=util-vserver.git diff --git a/lib/ccaps-v13.c b/lib/ccaps-v13.c index 7d457e7..d0045b0 100644 --- a/lib/ccaps-v13.c +++ b/lib/ccaps-v13.c @@ -25,13 +25,14 @@ #include #include +#include #include #define DECL(STR, VAL) { STR, sizeof(STR)-1, VAL } static struct Mapping_uint64 const VALUES[] = { DECL("set_utsname", VC_VXC_SET_UTSNAME), - DECL("rlimit", VC_VXC_SET_RLIMIT), + DECL("set_rlimit", VC_VXC_SET_RLIMIT), DECL("raw_icmp", VC_VXC_RAW_ICMP), DECL("syslog", VC_VXC_SYSLOG), DECL("secure_mount", VC_VXC_SECURE_MOUNT), @@ -40,18 +41,33 @@ static struct Mapping_uint64 const VALUES[] = { DECL("quota_ctl", VC_VXC_QUOTA_CTL), DECL("admin_mapper", VC_VXC_ADMIN_MAPPER), DECL("admin_cloop", VC_VXC_ADMIN_CLOOP), + DECL("kthread", VC_VXC_KTHREAD), // some deprecated values... DECL("mount", VC_VXC_SECURE_MOUNT), DECL("remount", VC_VXC_SECURE_REMOUNT), DECL("icmp", VC_VXC_RAW_ICMP), DECL("ping", VC_VXC_RAW_ICMP), DECL("utsname", VC_VXC_SET_UTSNAME), + DECL("rlimit", VC_VXC_SET_RLIMIT), }; +inline static char const * +removePrefix(char const *str, size_t *len) +{ + if ((len==0 || *len==0 || *len>4) && + strncasecmp("vxc_", str, 4)==0) { + if (len && *len>4) *len -= 4; + return str+4; + } + else + return str; +} + uint_least64_t vc_text2ccap(char const *str, size_t len) { - ssize_t idx = utilvserver_value2text_uint64(str, len, + char const * tmp = removePrefix(str, &len); + ssize_t idx = utilvserver_value2text_uint64(tmp, len, VALUES, DIM_OF(VALUES)); if (idx==-1) return 0; else return VALUES[idx].val;