diff --git a/[refs] b/[refs] index 9d9b515404b6..e2bc39dcb909 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2c9e703c618106f5383226fbb1f526cb11034f8a +refs/heads/master: 76b0187525f024cb391c8043adf2e359b2adb988 diff --git a/trunk/security/root_plug.c b/trunk/security/root_plug.c index 40fb4f15e27b..2f7ffa67c4d2 100644 --- a/trunk/security/root_plug.c +++ b/trunk/security/root_plug.c @@ -71,18 +71,6 @@ static int rootplug_bprm_check_security (struct linux_binprm *bprm) } static struct security_operations rootplug_security_ops = { - /* Use the capability functions for some of the hooks */ - .ptrace_may_access = cap_ptrace_may_access, - .ptrace_traceme = cap_ptrace_traceme, - .capget = cap_capget, - .capset = cap_capset, - .capable = cap_capable, - - .bprm_set_creds = cap_bprm_set_creds, - - .task_fix_setuid = cap_task_fix_setuid, - .task_prctl = cap_task_prctl, - .bprm_check_security = rootplug_bprm_check_security, };