aboutsummaryrefslogtreecommitdiff
path: root/security/capability.c
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2008-07-10 17:02:07 +0900
committerJames Morris <jmorris@namei.org>2008-07-14 15:04:06 +1000
commit6f0f0fd496333777d53daff21a4e3b28c4d03a6d (patch)
tree202de67376fce2547b44ae5b016d6424c3c7409c /security/capability.c
parent93cbace7a058bce7f99319ef6ceff4b78cf45051 (diff)
downloadlinux-2.6.34-ux500-6f0f0fd496333777d53daff21a4e3b28c4d03a6d.tar.gz
security: remove register_security hook
The register security hook is no longer required, as the capability module is always registered. LSMs wishing to stack capability as a secondary module should do so explicitly. Signed-off-by: James Morris <jmorris@namei.org> Acked-by: Stephen Smalley <sds@tycho.nsa.gov> Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'security/capability.c')
-rw-r--r--security/capability.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/security/capability.c b/security/capability.c
index 6e0671c8201..5b01c0b0242 100644
--- a/security/capability.c
+++ b/security/capability.c
@@ -721,12 +721,6 @@ static int cap_xfrm_decode_session(struct sk_buff *skb, u32 *fl, int ckall)
}
#endif /* CONFIG_SECURITY_NETWORK_XFRM */
-static int cap_register_security(const char *name,
- struct security_operations *ops)
-{
- return -EINVAL;
-}
-
static void cap_d_instantiate(struct dentry *dentry, struct inode *inode)
{
}
@@ -940,7 +934,6 @@ void security_fixup_ops(struct security_operations *ops)
set_to_cap_if_null(ops, sem_semop);
set_to_cap_if_null(ops, netlink_send);
set_to_cap_if_null(ops, netlink_recv);
- set_to_cap_if_null(ops, register_security);
set_to_cap_if_null(ops, d_instantiate);
set_to_cap_if_null(ops, getprocattr);
set_to_cap_if_null(ops, setprocattr);