diff options
author | David S. Miller <davem@davemloft.net> | 2008-03-18 08:37:55 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-03-18 08:37:55 +0100 |
commit | 577f99c1d08cf9cbdafd4e858dd13ff04d855090 (patch) | |
tree | 0f726bbda9b18d311d4c95198bbd96cb7ac01db0 /security/selinux/include | |
parent | iwlwifi: fix bug to show hidden APs during scan (diff) | |
parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval... (diff) | |
download | linux-577f99c1d08cf9cbdafd4e858dd13ff04d855090.tar.xz linux-577f99c1d08cf9cbdafd4e858dd13ff04d855090.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/rt2x00/rt2x00dev.c
net/8021q/vlan_dev.c
Diffstat (limited to 'security/selinux/include')
-rw-r--r-- | security/selinux/include/security.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/security/selinux/include/security.h b/security/selinux/include/security.h index 837ce420d2f6..f7d2f03781f2 100644 --- a/security/selinux/include/security.h +++ b/security/selinux/include/security.h @@ -35,6 +35,11 @@ #define POLICYDB_VERSION_MAX POLICYDB_VERSION_POLCAP #endif +#define CONTEXT_MNT 0x01 +#define FSCONTEXT_MNT 0x02 +#define ROOTCONTEXT_MNT 0x04 +#define DEFCONTEXT_MNT 0x08 + struct netlbl_lsm_secattr; extern int selinux_enabled; |