KEYS: Remove key_type::match in favour of overriding default by match_preparse

[pandora-kernel.git] / security / keys / user_defined.c

diff --git a/security/keys/user_defined.c b/security/keys/user_defined.c
index cd7e726..36b47bb 100644 (file)
--- a/security/keys/user_defined.c
+++ b/security/keys/user_defined.c
@@ -30,7 +30,6 @@ struct key_type key_type_user = {
        .free_preparse          = user_free_preparse,
        .instantiate            = generic_key_instantiate,
        .update                 = user_update,
        .free_preparse          = user_free_preparse,
        .instantiate            = generic_key_instantiate,
        .update                 = user_update,

-       .match                  = user_match,

        .revoke                 = user_revoke,
        .destroy                = user_destroy,
        .describe               = user_describe,
        .revoke                 = user_revoke,
        .destroy                = user_destroy,
        .describe               = user_describe,


@@ -51,7 +50,6 @@ struct key_type key_type_logon = {
        .free_preparse          = user_free_preparse,
        .instantiate            = generic_key_instantiate,
        .update                 = user_update,
        .free_preparse          = user_free_preparse,
        .instantiate            = generic_key_instantiate,
        .update                 = user_update,

-       .match                  = user_match,

        .revoke                 = user_revoke,
        .destroy                = user_destroy,
        .describe               = user_describe,
        .revoke                 = user_revoke,
        .destroy                = user_destroy,
        .describe               = user_describe,


@@ -136,16 +134,6 @@ error:
 
 EXPORT_SYMBOL_GPL(user_update);
 
 
 EXPORT_SYMBOL_GPL(user_update);
 

-/*
- * match users on their name
- */
-int user_match(const struct key *key, const struct key_match_data *match_data)
-{
-       return strcmp(key->description, match_data->raw_data) == 0;
-}
-
-EXPORT_SYMBOL_GPL(user_match);
-

 /*
  * dispose of the links from a revoked keyring
  * - called with the key sem write-locked
 /*
  * dispose of the links from a revoked keyring
  * - called with the key sem write-locked