diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-06 13:48:34 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-06 13:48:34 -0500 |
| commit | 8ed5de58cf4c45ff0ca97cb0d48d76f0e42faec6 (patch) | |
| tree | ede6bc489b4d0cae91d730393d6c0dc654528b46 /security/selinux/include/security.h | |
| parent | 2dd550b90b03d5f236a18ae491bf6e70798469a8 (diff) | |
| parent | 394c6753978a75cab7558a377f2551a3c1101027 (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: Remove security_get_policycaps()
security: allow Kconfig to set default mmap_min_addr protection
Diffstat (limited to 'security/selinux/include/security.h')
| -rw-r--r-- | security/selinux/include/security.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/security/selinux/include/security.h b/security/selinux/include/security.h index 23137c17f917..837ce420d2f6 100644 --- a/security/selinux/include/security.h +++ b/security/selinux/include/security.h | |||
| @@ -107,7 +107,6 @@ int security_get_classes(char ***classes, int *nclasses); | |||
| 107 | int security_get_permissions(char *class, char ***perms, int *nperms); | 107 | int security_get_permissions(char *class, char ***perms, int *nperms); |
| 108 | int security_get_reject_unknown(void); | 108 | int security_get_reject_unknown(void); |
| 109 | int security_get_allow_unknown(void); | 109 | int security_get_allow_unknown(void); |
| 110 | int security_get_policycaps(int *len, int **values); | ||
| 111 | 110 | ||
| 112 | #define SECURITY_FS_USE_XATTR 1 /* use xattr */ | 111 | #define SECURITY_FS_USE_XATTR 1 /* use xattr */ |
| 113 | #define SECURITY_FS_USE_TRANS 2 /* use transition SIDs, e.g. devpts/tmpfs */ | 112 | #define SECURITY_FS_USE_TRANS 2 /* use transition SIDs, e.g. devpts/tmpfs */ |