diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-11 12:21:26 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-11 12:21:26 -0500 |
| commit | 0faa90880331386ac86ca78d52692c7a94051eab (patch) | |
| tree | 7cb9311c118a2e766ae378a433421130bac32e8c /security/selinux/include/flask.h | |
| parent | 1f07e988290fc45932f5028c9e2a862c37a57336 (diff) | |
| parent | b68e418c445e8a468634d0a7ca2fb63bbaa74028 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
selinux: support 64-bit capabilities
Diffstat (limited to 'security/selinux/include/flask.h')
| -rw-r--r-- | security/selinux/include/flask.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/security/selinux/include/flask.h b/security/selinux/include/flask.h index 09e9dd23ee1a..febf8868e852 100644 --- a/security/selinux/include/flask.h +++ b/security/selinux/include/flask.h | |||
| @@ -51,6 +51,7 @@ | |||
| 51 | #define SECCLASS_DCCP_SOCKET 60 | 51 | #define SECCLASS_DCCP_SOCKET 60 |
| 52 | #define SECCLASS_MEMPROTECT 61 | 52 | #define SECCLASS_MEMPROTECT 61 |
| 53 | #define SECCLASS_PEER 68 | 53 | #define SECCLASS_PEER 68 |
| 54 | #define SECCLASS_CAPABILITY2 69 | ||
| 54 | 55 | ||
| 55 | /* | 56 | /* |
| 56 | * Security identifier indices for initial entities | 57 | * Security identifier indices for initial entities |