diff options
| author | David Howells <dhowells@redhat.com> | 2014-09-16 12:36:06 -0400 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2014-09-16 12:36:06 -0400 |
| commit | c06cfb08b88dfbe13be44a69ae2fdc3a7c902d81 (patch) | |
| tree | 8bc0e3794ffb426b3cbb2c0d7c2dbbd4b28e3054 /include/keys | |
| parent | 614d8c39014c185aa0f7254f0a470cc33fc1b284 (diff) | |
KEYS: Remove key_type::match in favour of overriding default by match_preparse
A previous patch added a ->match_preparse() method to the key type. This is
allowed to override the function called by the iteration algorithm.
Therefore, we can just set a default that simply checks for an exact match of
the key description with the original criterion data and allow match_preparse
to override it as needed.
The key_type::match op is then redundant and can be removed, as can the
user_match() function.
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Diffstat (limited to 'include/keys')
| -rw-r--r-- | include/keys/user-type.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/keys/user-type.h b/include/keys/user-type.h index 66d92af30e7c..cebefb069c44 100644 --- a/include/keys/user-type.h +++ b/include/keys/user-type.h | |||
| @@ -36,13 +36,10 @@ extern struct key_type key_type_user; | |||
| 36 | extern struct key_type key_type_logon; | 36 | extern struct key_type key_type_logon; |
| 37 | 37 | ||
| 38 | struct key_preparsed_payload; | 38 | struct key_preparsed_payload; |
| 39 | struct key_match_data; | ||
| 40 | 39 | ||
| 41 | extern int user_preparse(struct key_preparsed_payload *prep); | 40 | extern int user_preparse(struct key_preparsed_payload *prep); |
| 42 | extern void user_free_preparse(struct key_preparsed_payload *prep); | 41 | extern void user_free_preparse(struct key_preparsed_payload *prep); |
| 43 | extern int user_update(struct key *key, struct key_preparsed_payload *prep); | 42 | extern int user_update(struct key *key, struct key_preparsed_payload *prep); |
| 44 | extern int user_match(const struct key *key, | ||
| 45 | const struct key_match_data *match_data); | ||
| 46 | extern void user_revoke(struct key *key); | 43 | extern void user_revoke(struct key *key); |
| 47 | extern void user_destroy(struct key *key); | 44 | extern void user_destroy(struct key *key); |
| 48 | extern void user_describe(const struct key *user, struct seq_file *m); | 45 | extern void user_describe(const struct key *user, struct seq_file *m); |
