X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Fvs_base.h;fp=include%2Flinux%2Fvs_base.h;h=b2dfad6a5f5cbb52f9daf8397a4c23d9e436866c;hb=43bc926fffd92024b46cafaf7350d669ba9ca884;hp=a1d34b6ffc08a9111531e75689f4e64a5b6a1f55;hpb=cee37fe97739d85991964371c1f3a745c00dd236;p=linux-2.6.git diff --git a/include/linux/vs_base.h b/include/linux/vs_base.h index a1d34b6ff..b2dfad6a5 100644 --- a/include/linux/vs_base.h +++ b/include/linux/vs_base.h @@ -1,7 +1,6 @@ #ifndef _VX_VS_BASE_H #define _VX_VS_BASE_H - #include "vserver/context.h" @@ -16,7 +15,7 @@ /* * check current context for ADMIN/WATCH and - * optionally agains supplied argument + * optionally against supplied argument */ static inline int __vx_check(xid_t cid, xid_t id, unsigned int mode) { @@ -98,6 +97,9 @@ static inline int __vx_check(xid_t cid, xid_t id, unsigned int mode) (current->vx_info && \ (current->vx_info->vx_initpid == (n))) +#define vx_capable(b,c) (capable(b) || \ + ((current->euid == 0) && vx_ccaps(c))) + #else #warning duplicate inclusion