X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=security%2Fselinux%2Finclude%2Fsecurity.h;h=aa21ca1721af3f132947abd2c43de6e2416c29cc;hb=016b9bdb81d9c9c7800e4e224ade38d8b37669d3;hp=71c0a19c97538da142962be9a458b259205c1d80;hpb=b857c730d4e960d1876ff56ce5c4bd81ea9ff5ae;p=pandora-kernel.git

diff --git a/security/selinux/include/security.h b/security/selinux/include/security.h
index 71c0a19c9753..aa21ca1721af 100644
--- a/security/selinux/include/security.h
+++ b/security/selinux/include/security.h
@@ -23,17 +23,17 @@
 #define POLICYDB_VERSION_NLCLASS	18
 #define POLICYDB_VERSION_VALIDATETRANS	19
 #define POLICYDB_VERSION_MLS		19
+#define POLICYDB_VERSION_AVTAB		20
 
 /* Range of policy versions we understand*/
 #define POLICYDB_VERSION_MIN   POLICYDB_VERSION_BASE
-#define POLICYDB_VERSION_MAX   POLICYDB_VERSION_MLS
-
-#ifdef CONFIG_SECURITY_SELINUX_BOOTPARAM
-extern int selinux_enabled;
+#ifdef CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX
+#define POLICYDB_VERSION_MAX	CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX_VALUE
 #else
-#define selinux_enabled 1
+#define POLICYDB_VERSION_MAX	POLICYDB_VERSION_AVTAB
 #endif
 
+extern int selinux_enabled;
 extern int selinux_mls_enabled;
 
 int security_load_policy(void * data, size_t len);
@@ -82,6 +82,8 @@ int security_node_sid(u16 domain, void *addr, u32 addrlen,
 int security_validate_transition(u32 oldsid, u32 newsid, u32 tasksid,
                                  u16 tclass);
 
+int security_sid_mls_copy(u32 sid, u32 mls_sid, u32 *new_sid);
+
 #define SECURITY_FS_USE_XATTR		1 /* use xattr */
 #define SECURITY_FS_USE_TRANS		2 /* use transition SIDs, e.g. devpts/tmpfs */
 #define SECURITY_FS_USE_TASK		3 /* use task SIDs, e.g. pipefs/sockfs */