diff options
Diffstat (limited to 'security/keys/user_defined.c')
-rw-r--r-- | security/keys/user_defined.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/security/keys/user_defined.c b/security/keys/user_defined.c index eee340011f2b..36b47bbd3d8c 100644 --- a/security/keys/user_defined.c +++ b/security/keys/user_defined.c | |||
@@ -26,12 +26,10 @@ static int logon_vet_description(const char *desc); | |||
26 | */ | 26 | */ |
27 | struct key_type key_type_user = { | 27 | struct key_type key_type_user = { |
28 | .name = "user", | 28 | .name = "user", |
29 | .def_lookup_type = KEYRING_SEARCH_LOOKUP_DIRECT, | ||
30 | .preparse = user_preparse, | 29 | .preparse = user_preparse, |
31 | .free_preparse = user_free_preparse, | 30 | .free_preparse = user_free_preparse, |
32 | .instantiate = generic_key_instantiate, | 31 | .instantiate = generic_key_instantiate, |
33 | .update = user_update, | 32 | .update = user_update, |
34 | .match = user_match, | ||
35 | .revoke = user_revoke, | 33 | .revoke = user_revoke, |
36 | .destroy = user_destroy, | 34 | .destroy = user_destroy, |
37 | .describe = user_describe, | 35 | .describe = user_describe, |
@@ -48,12 +46,10 @@ EXPORT_SYMBOL_GPL(key_type_user); | |||
48 | */ | 46 | */ |
49 | struct key_type key_type_logon = { | 47 | struct key_type key_type_logon = { |
50 | .name = "logon", | 48 | .name = "logon", |
51 | .def_lookup_type = KEYRING_SEARCH_LOOKUP_DIRECT, | ||
52 | .preparse = user_preparse, | 49 | .preparse = user_preparse, |
53 | .free_preparse = user_free_preparse, | 50 | .free_preparse = user_free_preparse, |
54 | .instantiate = generic_key_instantiate, | 51 | .instantiate = generic_key_instantiate, |
55 | .update = user_update, | 52 | .update = user_update, |
56 | .match = user_match, | ||
57 | .revoke = user_revoke, | 53 | .revoke = user_revoke, |
58 | .destroy = user_destroy, | 54 | .destroy = user_destroy, |
59 | .describe = user_describe, | 55 | .describe = user_describe, |
@@ -139,16 +135,6 @@ error: | |||
139 | EXPORT_SYMBOL_GPL(user_update); | 135 | EXPORT_SYMBOL_GPL(user_update); |
140 | 136 | ||
141 | /* | 137 | /* |
142 | * match users on their name | ||
143 | */ | ||
144 | int user_match(const struct key *key, const void *description) | ||
145 | { | ||
146 | return strcmp(key->description, description) == 0; | ||
147 | } | ||
148 | |||
149 | EXPORT_SYMBOL_GPL(user_match); | ||
150 | |||
151 | /* | ||
152 | * dispose of the links from a revoked keyring | 138 | * dispose of the links from a revoked keyring |
153 | * - called with the key sem write-locked | 139 | * - called with the key sem write-locked |
154 | */ | 140 | */ |