diff options
| author | Miklos Szeredi <mszeredi@suse.cz> | 2008-07-03 20:56:05 +0200 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-07-14 15:03:04 +1000 |
| commit | 5915eb53861c5776cfec33ca4fcc1fd20d66dd27 (patch) | |
| tree | d4895b96dfdc227a3abe2f13c093b6f53ac3aef8 /security/security.c | |
| parent | b478a9f9889c81e88077d1495daadee64c0af541 (diff) | |
| download | linux-5915eb53861c5776cfec33ca4fcc1fd20d66dd27.tar.bz2 | |
security: remove dummy module
Remove the dummy module and make the "capability" module the default.
Compile and boot tested.
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Acked-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/security.c')
| -rw-r--r-- | security/security.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/security/security.c b/security/security.c index 28b2860c1129..30b0278de394 100644 --- a/security/security.c +++ b/security/security.c @@ -20,8 +20,8 @@ /* Boot-time LSM user choice */ static __initdata char chosen_lsm[SECURITY_NAME_MAX + 1]; -/* things that live in dummy.c */ -extern struct security_operations dummy_security_ops; +/* things that live in capability.c */ +extern struct security_operations default_security_ops; extern void security_fixup_ops(struct security_operations *ops); struct security_operations *security_ops; /* Initialized to NULL */ @@ -57,13 +57,8 @@ int __init security_init(void) { printk(KERN_INFO "Security Framework initialized\n"); - if (verify(&dummy_security_ops)) { - printk(KERN_ERR "%s could not verify " - "dummy_security_ops structure.\n", __func__); - return -EIO; - } - - security_ops = &dummy_security_ops; + security_fixup_ops(&default_security_ops); + security_ops = &default_security_ops; do_security_initcalls(); return 0; @@ -122,7 +117,7 @@ int register_security(struct security_operations *ops) return -EINVAL; } - if (security_ops != &dummy_security_ops) + if (security_ops != &default_security_ops) return -EAGAIN; security_ops = ops; |