diff options
Diffstat (limited to 'security/selinux/include')
| -rw-r--r-- | security/selinux/include/av_perm_to_string.h | 1 | ||||
| -rw-r--r-- | security/selinux/include/av_permissions.h | 1 | ||||
| -rw-r--r-- | security/selinux/include/conditional.h | 22 | ||||
| -rw-r--r-- | security/selinux/include/security.h | 11 |
4 files changed, 34 insertions, 1 deletions
diff --git a/security/selinux/include/av_perm_to_string.h b/security/selinux/include/av_perm_to_string.h index 0c616793b9b5..6891745ec2d4 100644 --- a/security/selinux/include/av_perm_to_string.h +++ b/security/selinux/include/av_perm_to_string.h @@ -84,6 +84,7 @@ static struct av_perm_to_string av_perm_to_string[] = { { SECCLASS_SECURITY, SECURITY__COMPUTE_RELABEL, "compute_relabel" }, { SECCLASS_SECURITY, SECURITY__COMPUTE_USER, "compute_user" }, { SECCLASS_SECURITY, SECURITY__SETENFORCE, "setenforce" }, + { SECCLASS_SECURITY, SECURITY__SETBOOL, "setbool" }, { SECCLASS_SYSTEM, SYSTEM__IPC_INFO, "ipc_info" }, { SECCLASS_SYSTEM, SYSTEM__SYSLOG_READ, "syslog_read" }, { SECCLASS_SYSTEM, SYSTEM__SYSLOG_MOD, "syslog_mod" }, diff --git a/security/selinux/include/av_permissions.h b/security/selinux/include/av_permissions.h index 72e53d4bc787..4d77e0c838c1 100644 --- a/security/selinux/include/av_permissions.h +++ b/security/selinux/include/av_permissions.h @@ -512,6 +512,7 @@ #define SECURITY__COMPUTE_RELABEL 0x00000020UL #define SECURITY__COMPUTE_USER 0x00000040UL #define SECURITY__SETENFORCE 0x00000080UL +#define SECURITY__SETBOOL 0x00000100UL #define SYSTEM__IPC_INFO 0x00000001UL #define SYSTEM__SYSLOG_READ 0x00000002UL diff --git a/security/selinux/include/conditional.h b/security/selinux/include/conditional.h new file mode 100644 index 000000000000..67ce7a8d8301 --- /dev/null +++ b/security/selinux/include/conditional.h @@ -0,0 +1,22 @@ +/* + * Interface to booleans in the security server. This is exported + * for the selinuxfs. + * + * Author: Karl MacMillan <kmacmillan@tresys.com> + * + * Copyright (C) 2003 - 2004 Tresys Technology, LLC + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 2. + */ + +#ifndef _SELINUX_CONDITIONAL_H_ +#define _SELINUX_CONDITIONAL_H_ + +int security_get_bools(int *len, char ***names, int **values); + +int security_set_bools(int len, int *values); + +int security_get_bool_value(int bool); + +#endif diff --git a/security/selinux/include/security.h b/security/selinux/include/security.h index 56bfc14c0825..d435426b7e80 100644 --- a/security/selinux/include/security.h +++ b/security/selinux/include/security.h @@ -2,7 +2,9 @@ * Security server interface. * * Author : Stephen Smalley, <sds@epoch.ncsc.mil> + * */ + #ifndef _SELINUX_SECURITY_H_ #define _SELINUX_SECURITY_H_ @@ -13,7 +15,8 @@ #define SECCLASS_NULL 0x0000 /* no class */ #define SELINUX_MAGIC 0xf97cff8c -#define POLICYDB_VERSION 15 +#define POLICYDB_VERSION 16 +#define POLICYDB_VERSION_COMPAT 15 #ifdef CONFIG_SECURITY_SELINUX_BOOTPARAM extern int selinux_enabled; @@ -21,6 +24,12 @@ extern int selinux_enabled; #define selinux_enabled 1 #endif +#ifdef CONFIG_SECURITY_SELINUX_MLS +#define selinux_mls_enabled 1 +#else +#define selinux_mls_enabled 0 +#endif + int security_load_policy(void * data, size_t len); struct av_decision { |