Merge branch 'next' into for-linus

This commit is contained in:
James Morris
2009-01-07 09:58:22 +11:00
26 changed files with 1231 additions and 425 deletions

View File

@@ -306,7 +306,7 @@ int capable(int cap)
BUG();
}
if (has_capability(current, cap)) {
if (security_capable(cap) == 0) {
current->flags |= PF_SUPERPRIV;
return 1;
}