---

yaml --- r: 285927 b: refs/heads/master c: 951880e h: refs/heads/master i: 285925: bf79b11 285923: c5b7ad1 285919: 694b1a2 v: v3
git-mirror · Jan 17, 2012 · d8006f4 · d8006f4
1 parent 68bf497
commit d8006f4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2bc3a316a7281f67e36b34dac2802cbe36a9128
+refs/heads/master: 951880e634a79884236a575b896abf55c39ae0bf
diff --git a/trunk/kernel/capability.c b/trunk/kernel/capability.c
@@ -384,7 +384,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
 		BUG();
 	}
 
-	if (has_ns_capability(current, ns, cap)) {
+	if (security_capable(current_cred(), ns, cap) == 0) {
 		current->flags |= PF_SUPERPRIV;
 		return true;
 	}