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 core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
linux
/
capability.h
diff --git
a/include/linux/capability.h
b/include/linux/capability.h
index
c96e7b6
..
3e56973
100644
(file)
--- a/
include/linux/capability.h
+++ b/
include/linux/capability.h
@@
-43,8
+43,7
@@
typedef struct __user_cap_data_struct {
#ifdef __KERNEL__
#include <linux/spinlock.h>
#ifdef __KERNEL__
#include <linux/spinlock.h>
-
-extern spinlock_t task_capability_lock;
+#include <asm/current.h>
/* #define STRICT_CAP_T_TYPECHECKS */
/* #define STRICT_CAP_T_TYPECHECKS */
@@
-235,6
+234,8
@@
typedef __u32 kernel_cap_t;
/* Allow enabling/disabling tagged queuing on SCSI controllers and sending
arbitrary SCSI commands */
/* Allow setting encryption key on loopback filesystem */
/* Allow enabling/disabling tagged queuing on SCSI controllers and sending
arbitrary SCSI commands */
/* Allow setting encryption key on loopback filesystem */
+/* Allow setting zone reclaim policy */
+/* Allow the selection of a security context */
#define CAP_SYS_ADMIN 21
#define CAP_SYS_ADMIN 21
@@
-284,6
+285,15
@@
typedef __u32 kernel_cap_t;
#define CAP_LEASE 28
#define CAP_LEASE 28
+#define CAP_AUDIT_WRITE 29
+
+#define CAP_AUDIT_CONTROL 30
+
+/* Allow context manipulations */
+/* Allow changing context info on files */
+
+#define CAP_CONTEXT 31
+
#ifdef __KERNEL__
/*
* Bounding set
#ifdef __KERNEL__
/*
* Bounding set
@@
-353,6
+363,9
@@
static inline kernel_cap_t cap_invert(kernel_cap_t c)
#define cap_is_fs_cap(c) (CAP_TO_MASK(c) & CAP_FS_MASK)
#define cap_is_fs_cap(c) (CAP_TO_MASK(c) & CAP_FS_MASK)
+int capable(int cap);
+int __capable(struct task_struct *t, int cap);
+
#endif /* __KERNEL__ */
#endif /* !_LINUX_CAPABILITY_H */
#endif /* __KERNEL__ */
#endif /* !_LINUX_CAPABILITY_H */