[BISECTED] commit d2a7009f breaks xkbconf

[walt]

Hi Eric.  The commit below causes a very strange error while running startx.

While X is starting up it runs xkbcomp, which then prints "ERROR: Cannot
open /usr/share/X11/xkb/compiled/server-0.xkm to write keyboard description"
and then X shuts down.  Reverting the commit below fixes the error:

commit d2a7009f0bb03fa22ad08dd25472efa0568126b9
Author: Eric Paris
Date:   Tue Jan 3 12:25:15 2012 -0500

    capabitlies: ns_capable can use the cap helpers rather than lsm call
    
    Just to reduce the number of places to change if we every change the LSM
    hook, use the capability helpers internally when possible.

diff --git a/kernel/capability.c b/kernel/capability.c
index 5f99e5d..4762644 100644
--- a/kernel/capability.c
+++ b/kernel/capability.c
@@ -384,7 +384,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
                BUG();
        }
 
-       if (security_capable(current_cred(), ns, cap) == 0) {
+       if (has_ns_capability(current, ns, cap)) {
                current->flags |= PF_SUPERPRIV;
                return true;
        }

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/