diff options
| author | James Morris <jmorris@namei.org> | 2010-03-01 09:36:31 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-03-01 09:36:31 +1100 |
| commit | b4ccebdd37ff70d349321a198f416ba737a5e833 (patch) | |
| tree | 275d717070346722c3aacd8355fb4f743216e03b /security/selinux/include/security.h | |
| parent | 30ff056c42c665b9ea535d8515890857ae382540 (diff) | |
| parent | ef57471a73b67a7b65fd8708fd55c77cb7c619af (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'security/selinux/include/security.h')
| -rw-r--r-- | security/selinux/include/security.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/security/selinux/include/security.h b/security/selinux/include/security.h index 2553266ad793..1f7c2491d3dc 100644 --- a/security/selinux/include/security.h +++ b/security/selinux/include/security.h @@ -57,7 +57,6 @@ struct netlbl_lsm_secattr; extern int selinux_enabled; -extern int selinux_mls_enabled; /* Policy capabilities */ enum { @@ -80,6 +79,8 @@ extern int selinux_policycap_openperm; /* limitation of boundary depth */ #define POLICYDB_BOUNDS_MAXDEPTH 4 +int security_mls_enabled(void); + int security_load_policy(void *data, size_t len); int security_policycap_supported(unsigned int req_cap); @@ -96,13 +97,11 @@ struct av_decision { /* definitions of av_decision.flags */ #define AVD_FLAGS_PERMISSIVE 0x0001 -int security_compute_av(u32 ssid, u32 tsid, - u16 tclass, u32 requested, - struct av_decision *avd); +void security_compute_av(u32 ssid, u32 tsid, + u16 tclass, struct av_decision *avd); -int security_compute_av_user(u32 ssid, u32 tsid, - u16 tclass, u32 requested, - struct av_decision *avd); +void security_compute_av_user(u32 ssid, u32 tsid, + u16 tclass, struct av_decision *avd); int security_transition_sid(u32 ssid, u32 tsid, u16 tclass, u32 *out_sid); |