leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master'; commit 'v2.6.38-rc7' into next

Browse Source
This commit is contained in:
James Morris
2011-03-08 10:55:06 +11:00
parent eae61f3c82 214d93b02c
commit 1cc26bada9
5835 changed files with 311329 additions and 157794 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
security/security.c
View File

@@ -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)