diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-07-24 07:36:19 -0400 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-07-24 07:36:19 -0400 |
| commit | 4ca332e11df42604e784bd7da9e483160636d05e (patch) | |
| tree | 82e6ba6dff978edc2132e751c19197de50218c7e /include/linux/key.h | |
| parent | 6d6f3328422a3bc56b0d8dd026a5de845d2abfa7 (diff) | |
| parent | 633706a2ee81637be37b6bc02c5336950cc163b5 (diff) | |
Merge tag 'keys-next-20140722' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
Diffstat (limited to 'include/linux/key.h')
| -rw-r--r-- | include/linux/key.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/key.h b/include/linux/key.h index 017b0826642f..e1d4715f3222 100644 --- a/include/linux/key.h +++ b/include/linux/key.h | |||
| @@ -170,6 +170,8 @@ struct key { | |||
| 170 | #define KEY_FLAG_INVALIDATED 7 /* set if key has been invalidated */ | 170 | #define KEY_FLAG_INVALIDATED 7 /* set if key has been invalidated */ |
| 171 | #define KEY_FLAG_TRUSTED 8 /* set if key is trusted */ | 171 | #define KEY_FLAG_TRUSTED 8 /* set if key is trusted */ |
| 172 | #define KEY_FLAG_TRUSTED_ONLY 9 /* set if keyring only accepts links to trusted keys */ | 172 | #define KEY_FLAG_TRUSTED_ONLY 9 /* set if keyring only accepts links to trusted keys */ |
| 173 | #define KEY_FLAG_BUILTIN 10 /* set if key is builtin */ | ||
| 174 | #define KEY_FLAG_ROOT_CAN_INVAL 11 /* set if key can be invalidated by root without permission */ | ||
| 173 | 175 | ||
| 174 | /* the key type and key description string | 176 | /* the key type and key description string |
| 175 | * - the desc is used to match a key against search criteria | 177 | * - the desc is used to match a key against search criteria |