summaryrefslogtreecommitdiffstats
path: root/security/capability.c
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2009-01-07 09:21:54 +1100
committerJames Morris <jmorris@namei.org>2009-01-07 09:21:54 +1100
commit29881c4502ba05f46bc12ae8053d4e08d7e2615c (patch)
tree536ea4ac63554e836438bd5f370ddecaa343f1f4 /security/capability.c
parent76f7ba35d4b5219fcc4cb072134c020ec77d030d (diff)
downloadlinux-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 'security/capability.c')
-rw-r--r--security/capability.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/security/capability.c b/security/capability.c
index fd1493da4f8d..2dce66fcb992 100644
--- a/security/capability.c
+++ b/security/capability.c
@@ -826,7 +826,6 @@ void security_fixup_ops(struct security_operations *ops)
set_to_cap_if_null(ops, capset);
set_to_cap_if_null(ops, acct);
set_to_cap_if_null(ops, capable);
- set_to_cap_if_null(ops, task_capable);
set_to_cap_if_null(ops, quotactl);
set_to_cap_if_null(ops, quota_on);
set_to_cap_if_null(ops, sysctl);