diff options
| author | James Morris <jmorris@namei.org> | 2011-03-29 23:51:46 +0200 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-03-29 23:51:46 +0200 |
| commit | 93b9c98b3498db5842e2812b32cff4c1ae947eb1 (patch) | |
| tree | 2d18e46cadcbf66fff695bb16e86531281cde7be /security/keys/internal.h | |
| parent | Merge branch 'master'; commit 'v2.6.39-rc1' into next (diff) | |
| parent | security: select correct default LSM_MMAP_MIN_ADDR on ARM. (diff) | |
| download | linux-93b9c98b3498db5842e2812b32cff4c1ae947eb1.tar.xz linux-93b9c98b3498db5842e2812b32cff4c1ae947eb1.zip | |
Merge branch 'next-queue' into next
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, |