diff -NurpP linux-2.6.16-vs2.1.1-rc14.3/kernel/vserver/context.c linux-2.6.16-vs2.1.1-rc14.4/kernel/vserver/context.c --- linux-2.6.16-vs2.1.1-rc14.3/kernel/vserver/context.c 2006-03-24 04:45:09 +0100 +++ linux-2.6.16-vs2.1.1-rc14.4/kernel/vserver/context.c 2006-03-24 16:57:24 +0100 @@ -789,8 +789,6 @@ int vc_vx_info(uint32_t id, void __user struct vx_info *vxi; struct vcmd_vx_info_v0 vc_data; - if (!vx_check(0, VX_ADMIN)) - return -ENOSYS; if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RESOURCE)) return -EPERM; diff -NurpP linux-2.6.16-vs2.1.1-rc14.3/kernel/vserver/dlimit.c linux-2.6.16-vs2.1.1-rc14.4/kernel/vserver/dlimit.c --- linux-2.6.16-vs2.1.1-rc14.3/kernel/vserver/dlimit.c 2006-03-24 04:45:21 +0100 +++ linux-2.6.16-vs2.1.1-rc14.4/kernel/vserver/dlimit.c 2006-03-24 16:59:01 +0100 @@ -233,8 +233,6 @@ int vc_add_dlimit(uint32_t id, void __us { struct vcmd_ctx_dlimit_base_v0 vc_data; - if (!vx_check(0, VX_ADMIN)) - return -ENOSYS; if (copy_from_user (&vc_data, data, sizeof(vc_data))) return -EFAULT; @@ -245,8 +243,6 @@ int vc_rem_dlimit(uint32_t id, void __us { struct vcmd_ctx_dlimit_base_v0 vc_data; - if (!vx_check(0, VX_ADMIN)) - return -ENOSYS; if (copy_from_user (&vc_data, data, sizeof(vc_data))) return -EFAULT; @@ -259,8 +255,6 @@ int vc_add_dlimit_x32(uint32_t id, void { struct vcmd_ctx_dlimit_base_v0_x32 vc_data; - if (!vx_check(0, VX_ADMIN)) - return -ENOSYS; if (copy_from_user (&vc_data, data, sizeof(vc_data))) return -EFAULT; @@ -272,8 +266,6 @@ int vc_rem_dlimit_x32(uint32_t id, void { struct vcmd_ctx_dlimit_base_v0_x32 vc_data; - if (!vx_check(0, VX_ADMIN)) - return -ENOSYS; if (copy_from_user (&vc_data, data, sizeof(vc_data))) return -EFAULT; @@ -350,8 +342,6 @@ int vc_set_dlimit(uint32_t id, void __us { struct vcmd_ctx_dlimit_v0 vc_data; - if (!vx_check(0, VX_ADMIN)) - return -ENOSYS; if (copy_from_user (&vc_data, data, sizeof(vc_data))) return -EFAULT; @@ -367,8 +357,6 @@ int vc_set_dlimit_x32(uint32_t id, void { struct vcmd_ctx_dlimit_v0_x32 vc_data; - if (!vx_check(0, VX_ADMIN)) - return -ENOSYS; if (copy_from_user (&vc_data, data, sizeof(vc_data))) return -EFAULT; @@ -434,8 +422,6 @@ int vc_get_dlimit(uint32_t id, void __us struct vcmd_ctx_dlimit_v0 vc_data; int ret; - if (!vx_check(0, VX_ADMIN)) - return -ENOSYS; if (copy_from_user (&vc_data, data, sizeof(vc_data))) return -EFAULT; @@ -458,8 +444,6 @@ int vc_get_dlimit_x32(uint32_t id, void struct vcmd_ctx_dlimit_v0_x32 vc_data; int ret; - if (!vx_check(0, VX_ADMIN)) - return -ENOSYS; if (copy_from_user (&vc_data, data, sizeof(vc_data))) return -EFAULT; diff -NurpP linux-2.6.16-vs2.1.1-rc14.3/kernel/vserver/inode.c linux-2.6.16-vs2.1.1-rc14.4/kernel/vserver/inode.c --- linux-2.6.16-vs2.1.1-rc14.3/kernel/vserver/inode.c 2006-03-24 04:45:55 +0100 +++ linux-2.6.16-vs2.1.1-rc14.4/kernel/vserver/inode.c 2006-03-24 16:59:16 +0100 @@ -76,8 +76,6 @@ int vc_get_iattr(uint32_t id, void __use struct vcmd_ctx_iattr_v1 vc_data = { .xid = -1 }; int ret; - if (!vx_check(0, VX_ADMIN)) - return -ENOSYS; if (copy_from_user (&vc_data, data, sizeof(vc_data))) return -EFAULT; diff -NurpP linux-2.6.16-vs2.1.1-rc14.3/kernel/vserver/namespace.c linux-2.6.16-vs2.1.1-rc14.4/kernel/vserver/namespace.c --- linux-2.6.16-vs2.1.1-rc14.3/kernel/vserver/namespace.c 2006-03-20 17:34:50 +0100 +++ linux-2.6.16-vs2.1.1-rc14.4/kernel/vserver/namespace.c 2006-03-24 17:00:56 +0100 @@ -53,9 +53,6 @@ int vc_enter_namespace(uint32_t id, void struct namespace *old_ns; int ret = 0; - if (!vx_check(0, VX_ADMIN)) - return -ENOSYS; - vxi = lookup_vx_info(id); if (!vxi) return -ESRCH; diff -NurpP linux-2.6.16-vs2.1.1-rc14.3/kernel/vserver/network.c linux-2.6.16-vs2.1.1-rc14.4/kernel/vserver/network.c --- linux-2.6.16-vs2.1.1-rc14.3/kernel/vserver/network.c 2006-03-24 04:46:12 +0100 +++ linux-2.6.16-vs2.1.1-rc14.4/kernel/vserver/network.c 2006-03-24 17:01:11 +0100 @@ -549,8 +549,6 @@ int vc_nx_info(uint32_t id, void __user struct nx_info *nxi; struct vcmd_nx_info_v0 vc_data; - if (!vx_check(0, VX_ADMIN)) - return -ENOSYS; if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RESOURCE)) return -EPERM; diff -NurpP linux-2.6.16-vs2.1.1-rc14.3/kernel/vserver/signal.c linux-2.6.16-vs2.1.1-rc14.4/kernel/vserver/signal.c --- linux-2.6.16-vs2.1.1-rc14.3/kernel/vserver/signal.c 2006-03-20 17:34:50 +0100 +++ linux-2.6.16-vs2.1.1-rc14.4/kernel/vserver/signal.c 2006-03-24 17:01:28 +0100 @@ -75,8 +75,6 @@ int vc_ctx_kill(uint32_t id, void __user struct vcmd_ctx_kill_v0 vc_data; struct vx_info *vxi; - if (!vx_check(0, VX_ADMIN)) - return -ENOSYS; if (copy_from_user (&vc_data, data, sizeof(vc_data))) return -EFAULT;