diff options
| author | James Morris <jmorris@namei.org> | 2011-05-24 14:55:24 +0200 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-05-24 14:55:24 +0200 |
| commit | 434d42cfd05a7cc452457a81d2029540cba12150 (patch) | |
| tree | 3a6b9b7f9ff2e1b7409dd66c15242b2a75aa4422 /security/keys/internal.h | |
| parent | Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/let... (diff) | |
| parent | Merge branch 'master' into next (diff) | |
| download | linux-434d42cfd05a7cc452457a81d2029540cba12150.tar.xz linux-434d42cfd05a7cc452457a81d2029540cba12150.zip | |
Merge branch 'next' into for-linus
Diffstat (limited to 'security/keys/internal.h')
| -rw-r--r-- | security/keys/internal.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/security/keys/internal.h b/security/keys/internal.h index 07a025f81902..f375152a2500 100644 --- a/security/keys/internal.h +++ b/security/keys/internal.h @@ -109,11 +109,13 @@ extern key_ref_t keyring_search_aux(key_ref_t keyring_ref, const struct cred *cred, struct key_type *type, const void *description, - key_match_func_t match); + key_match_func_t match, + bool no_state_check); extern key_ref_t search_my_process_keyrings(struct key_type *type, const void *description, key_match_func_t match, + bool no_state_check, const struct cred *cred); extern key_ref_t search_process_keyrings(struct key_type *type, const void *description, |