diff options
| author | David Howells <dhowells@redhat.com> | 2012-05-11 10:56:56 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2012-05-11 10:56:56 +0100 |
| commit | 1eb1bcf5bfad001128293b86d891c9d6f2f27333 (patch) | |
| tree | af7fce4f0dae5bad37335b0fcf8b2e0d27342a9b | |
| parent | 9f7ce8e249ab761c7ed753059cb16319ede41762 (diff) | |
| download | linux-1eb1bcf5bfad001128293b86d891c9d6f2f27333.tar.gz linux-1eb1bcf5bfad001128293b86d891c9d6f2f27333.tar.bz2 linux-1eb1bcf5bfad001128293b86d891c9d6f2f27333.zip | |
KEYS: Announce key type (un)registration
Announce the (un)registration of a key type in the core key code rather than
in the callers.
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Mimi Zohar <zohar@us.ibm.com>
| -rw-r--r-- | net/dns_resolver/dns_key.c | 5 | ||||
| -rw-r--r-- | security/keys/key.c | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/net/dns_resolver/dns_key.c b/net/dns_resolver/dns_key.c index c73bba326d70..14b2c3d6e526 100644 --- a/net/dns_resolver/dns_key.c +++ b/net/dns_resolver/dns_key.c @@ -249,9 +249,6 @@ static int __init init_dns_resolver(void) struct key *keyring; int ret; - printk(KERN_NOTICE "Registering the %s key type\n", - key_type_dns_resolver.name); - /* create an override credential set with a special thread keyring in * which DNS requests are cached * @@ -301,8 +298,6 @@ static void __exit exit_dns_resolver(void) key_revoke(dns_resolver_cache->thread_keyring); unregister_key_type(&key_type_dns_resolver); put_cred(dns_resolver_cache); - printk(KERN_NOTICE "Unregistered %s key type\n", - key_type_dns_resolver.name); } module_init(init_dns_resolver) diff --git a/security/keys/key.c b/security/keys/key.c index 06783cffb3af..dc628941ecd3 100644 --- a/security/keys/key.c +++ b/security/keys/key.c @@ -980,6 +980,8 @@ int register_key_type(struct key_type *ktype) /* store the type */ list_add(&ktype->link, &key_types_list); + + pr_notice("Key type %s registered\n", ktype->name); ret = 0; out: @@ -1002,6 +1004,7 @@ void unregister_key_type(struct key_type *ktype) list_del_init(&ktype->link); downgrade_write(&key_types_sem); key_gc_keytype(ktype); + pr_notice("Key type %s unregistered\n", ktype->name); up_read(&key_types_sem); } EXPORT_SYMBOL(unregister_key_type); |