diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-12-02 18:06:12 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-12-02 18:06:12 +1100 |
| commit | 188324808572faf096a5fd8c1986874bc904dafe (patch) | |
| tree | 4a1cf9abf2e28e6d4c5d160892dfc0b40ba06a5c /security/keys/internal.h | |
| parent | 3a18ca061311f2f1ee9c44012f89c7436d392117 (diff) | |
| parent | 0b0a84154eff56913e91df29de5c3a03a0029e38 (diff) | |
Merge tag 'keys-fixes-20141201' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into for-linus
Diffstat (limited to 'security/keys/internal.h')
| -rw-r--r-- | security/keys/internal.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/security/keys/internal.h b/security/keys/internal.h index b8960c4959a5..200e37867336 100644 --- a/security/keys/internal.h +++ b/security/keys/internal.h @@ -117,6 +117,7 @@ struct keyring_search_context { #define KEYRING_SEARCH_NO_UPDATE_TIME 0x0004 /* Don't update times */ #define KEYRING_SEARCH_NO_CHECK_PERM 0x0008 /* Don't check permissions */ #define KEYRING_SEARCH_DETECT_TOO_DEEP 0x0010 /* Give an error on excessive depth */ +#define KEYRING_SEARCH_SKIP_EXPIRED 0x0020 /* Ignore expired keys (intention to replace) */ int (*iterator)(const void *object, void *iterator_data); |