aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew G. Morgan <morgan@kernel.org>2008-07-09 23:13:56 -0700
committerAndrew G. Morgan <morgan@kernel.org>2008-07-09 23:13:56 -0700
commitb3504f5201f529983a4f9d366732b69692ca92e8 (patch)
treee9e09adb0cee1cd788c13d53b05801021af05978
parentde725302235526a14c2dda28d9edc086f58c3fb2 (diff)
downloadlibcap-b3504f5201f529983a4f9d366732b69692ca92e8.tar.gz
Up to date with Linus' tree.
This change should not impact any code. Signed-off-by: Andrew G. Morgan <morgan@kernel.org>
-rw-r--r--libcap/include/linux/capability.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/libcap/include/linux/capability.h b/libcap/include/linux/capability.h
index 272e040..0267384 100644
--- a/libcap/include/linux/capability.h
+++ b/libcap/include/linux/capability.h
@@ -31,7 +31,7 @@ struct task_struct;
#define _LINUX_CAPABILITY_VERSION_1 0x19980330
#define _LINUX_CAPABILITY_U32S_1 1
-#define _LINUX_CAPABILITY_VERSION_2 0x20071026 /* depreciated - use v3 */
+#define _LINUX_CAPABILITY_VERSION_2 0x20071026 /* deprecated - use v3 */
#define _LINUX_CAPABILITY_U32S_2 2
#define _LINUX_CAPABILITY_VERSION_3 0x20080522
@@ -501,6 +501,8 @@ extern const kernel_cap_t __cap_empty_set;
extern const kernel_cap_t __cap_full_set;
extern const kernel_cap_t __cap_init_eff_set;
+kernel_cap_t cap_set_effective(const kernel_cap_t pE_new);
+
int capable(int cap);
int __capable(struct task_struct *t, int cap);