git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
include
/
linux
/
vs_base.h
diff --git
a/include/linux/vs_base.h
b/include/linux/vs_base.h
index
a1d34b6
..
b2dfad6
100644
(file)
--- 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
#ifndef _VX_VS_BASE_H
#define _VX_VS_BASE_H
-
#include "vserver/context.h"
#include "vserver/context.h"
@@
-16,7
+15,7
@@
/*
* check current context for ADMIN/WATCH and
/*
* check current context for ADMIN/WATCH and
- * optionally agains supplied argument
+ * optionally agains
t
supplied argument
*/
static inline int __vx_check(xid_t cid, xid_t id, unsigned int mode)
{
*/
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)))
(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
#else
#warning duplicate inclusion