summaryrefslogtreecommitdiffstats
path: root/security/security.c
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2011-03-08 10:55:06 +1100
committerJames Morris <jmorris@namei.org>2011-03-08 10:55:06 +1100
commit1cc26bada9f6807814806db2f0d78792eecdac71 (patch)
tree5509b5139db04af6c13db0a580c84116a4a54039 /security/security.c
parenteae61f3c829439f8f9121b5cd48a14be04df451f (diff)
parent214d93b02c4fe93638ad268613c9702a81ed9192 (diff)
downloadop-kernel-dev-1cc26bada9f6807814806db2f0d78792eecdac71.zip
op-kernel-dev-1cc26bada9f6807814806db2f0d78792eecdac71.tar.gz
Merge branch 'master'; commit 'v2.6.38-rc7' into next
Diffstat (limited to 'security/security.c')
-rw-r--r--security/security.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/security/security.c b/security/security.c
index b84a89d..1a4993b 100644
--- a/security/security.c
+++ b/security/security.c
@@ -154,10 +154,9 @@ int security_capset(struct cred *new, const struct cred *old,
effective, inheritable, permitted);
}
-int security_capable(int cap)
+int security_capable(const struct cred *cred, int cap)
{
- return security_ops->capable(current, current_cred(), cap,
- SECURITY_CAP_AUDIT);
+ return security_ops->capable(current, cred, cap, SECURITY_CAP_AUDIT);
}
int security_real_capable(struct task_struct *tsk, int cap)
OpenPOWER on IntegriCloud