diff options
author | James Morris <jmorris@namei.org> | 2009-01-07 09:21:54 +1100 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2009-01-07 09:21:54 +1100 |
commit | 29881c4502ba05f46bc12ae8053d4e08d7e2615c (patch) | |
tree | 536ea4ac63554e836438bd5f370ddecaa343f1f4 /include/linux/capability.h | |
parent | 76f7ba35d4b5219fcc4cb072134c020ec77d030d (diff) | |
download | linux-stable-29881c4502ba05f46bc12ae8053d4e08d7e2615c.tar.gz linux-stable-29881c4502ba05f46bc12ae8053d4e08d7e2615c.tar.bz2 linux-stable-29881c4502ba05f46bc12ae8053d4e08d7e2615c.zip |
Revert "CRED: Fix regression in cap_capable() as shown up by sys_faccessat() [ver #2]"
This reverts commit 14eaddc967b16017d4a1a24d2be6c28ecbe06ed8.
David has a better version to come.
Diffstat (limited to 'include/linux/capability.h')
-rw-r--r-- | include/linux/capability.h | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/include/linux/capability.h b/include/linux/capability.h index 5b8a13214451..e22f48c2a46f 100644 --- a/include/linux/capability.h +++ b/include/linux/capability.h @@ -529,21 +529,8 @@ extern const kernel_cap_t __cap_init_eff_set; * * Note that this does not set PF_SUPERPRIV on the task. */ -#define has_capability(t, cap) (security_task_capable((t), (cap)) == 0) - -/** - * has_capability_noaudit - Determine if a task has a superior capability available (unaudited) - * @t: The task in question - * @cap: The capability to be tested for - * - * Return true if the specified task has the given superior capability - * currently in effect, false if not, but don't write an audit message for the - * check. - * - * Note that this does not set PF_SUPERPRIV on the task. - */ -#define has_capability_noaudit(t, cap) \ - (security_task_capable_noaudit((t), (cap)) == 0) +#define has_capability(t, cap) (security_capable((t), (cap)) == 0) +#define has_capability_noaudit(t, cap) (security_capable_noaudit((t), (cap)) == 0) extern int capable(int cap); |