From a288db4018943067291cfd2ce2adbc84d7febe32 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Wed, 24 Mar 2004 01:07:11 +0000 Subject: [PATCH] handle the new struct vc_ctx_caps::bmask member 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 | 4 +--- util-vserver/lib/syscall_getccaps-v13.hc | 1 + util-vserver/lib/syscall_setccaps-v13.hc | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/util-vserver/lib/bcaps_list-v13.c b/util-vserver/lib/bcaps_list-v13.c index e62bbd1..c61014e 100644 --- a/util-vserver/lib/bcaps_list-v13.c +++ b/util-vserver/lib/bcaps_list-v13.c @@ -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); } diff --git a/util-vserver/lib/syscall_getccaps-v13.hc b/util-vserver/lib/syscall_getccaps-v13.hc index a0708c3..28295ce 100644 --- a/util-vserver/lib/syscall_getccaps-v13.hc +++ b/util-vserver/lib/syscall_getccaps-v13.hc @@ -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; diff --git a/util-vserver/lib/syscall_setccaps-v13.hc b/util-vserver/lib/syscall_setccaps-v13.hc index f37b9c7..b318182 100644 --- a/util-vserver/lib/syscall_setccaps-v13.hc +++ b/util-vserver/lib/syscall_setccaps-v13.hc @@ -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; -- 1.8.1.5