Now that capability functions are default, rootplug no longer needs to manually add them to its security_ops.
Cc: Greg Kroah <[EMAIL PROTECTED]> Signed-off-by: Chris Wright <[EMAIL PROTECTED]> --- security/root_plug.c | 14 +------------- 1 files changed, 1 insertion(+), 13 deletions(-) Index: lsm-hooks-2.6/security/root_plug.c =================================================================== --- lsm-hooks-2.6.orig/security/root_plug.c +++ lsm-hooks-2.6/security/root_plug.c @@ -83,19 +83,7 @@ static int rootplug_bprm_check_security } static struct security_operations rootplug_security_ops = { - /* Use the capability functions for some of the hooks */ - .ptrace = cap_ptrace, - .capget = cap_capget, - .capset_check = cap_capset_check, - .capset_set = cap_capset_set, - .capable = cap_capable, - - .bprm_apply_creds = cap_bprm_apply_creds, - .bprm_set_security = cap_bprm_set_security, - - .task_post_setuid = cap_task_post_setuid, - .task_reparent_to_init = cap_task_reparent_to_init, - + /* The capability functions are the defaults */ .bprm_check_security = rootplug_bprm_check_security, }; -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/