handle the new struct vc_ctx_caps::bmask member
authorEnrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Wed, 24 Mar 2004 01:07:11 +0000 (01:07 +0000)
committerEnrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Wed, 24 Mar 2004 01:07:11 +0000 (01:07 +0000)
git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1323 94cd875c-1c1d-0410-91d2-eb244daf1a30

util-vserver/lib/bcaps_list-v13.c
util-vserver/lib/syscall_getccaps-v13.hc
util-vserver/lib/syscall_setccaps-v13.hc

index e62bbd1..c61014e 100644 (file)
@@ -30,11 +30,9 @@ vc_list2bcap(char const *str, size_t len,
             struct vc_err_listparser *err,
             struct vc_ctx_caps *caps)
 {
-  uint_least64_t       tmp=0;
-  
   return utilvserver_listparser_uint64(str, len,
                                       err ? &err->ptr : 0,
                                       err ? &err->len : 0,
-                                      &caps->bcaps, &tmp,
+                                      &caps->bcaps, &caps->bmask,
                                       vc_text2bcap);
 }
index a0708c3..28295ce 100644 (file)
@@ -28,6 +28,7 @@ vc_get_ccaps_v13(xid_t xid, struct vc_ctx_caps *caps)
   
   res = vserver(VCMD_get_ccaps, CTX_USER2KERNEL(xid), &k_caps);
   caps->bcaps = k_caps.bcaps;
+  caps->bmask = ~0ull;
   caps->ccaps = k_caps.ccaps;
   caps->cmask = k_caps.cmask;
 
index f37b9c7..b318182 100644 (file)
@@ -25,7 +25,7 @@ vc_set_ccaps_v13(xid_t xid, struct vc_ctx_caps const *caps)
 {
   struct vcmd_ctx_caps_v0      k_caps;
 
-  k_caps.bcaps = caps->bcaps;
+  k_caps.bcaps = caps->bcaps & caps->bmask;
   k_caps.ccaps = caps->ccaps;
   k_caps.cmask = caps->cmask;