diff options
| author | James Morris <jmorris@namei.org> | 2009-01-07 09:58:22 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-01-07 09:58:22 +1100 |
| commit | ac8cc0fa5395fe2278e305a4cbed48e90d88d878 (patch) | |
| tree | 515f577bfddd054ee4373228be7c974dfb8133af /security/selinux/selinuxfs.c | |
| parent | 238c6d54830c624f34ac9cf123ac04aebfca5013 (diff) | |
| parent | 3699c53c485bf0168e6500d0ed18bf931584dd7c (diff) | |
| download | op-kernel-dev-ac8cc0fa5395fe2278e305a4cbed48e90d88d878.zip op-kernel-dev-ac8cc0fa5395fe2278e305a4cbed48e90d88d878.tar.gz | |
Merge branch 'next' into for-linus
Diffstat (limited to 'security/selinux/selinuxfs.c')
| -rw-r--r-- | security/selinux/selinuxfs.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c index 8f612c8..01ec6d2 100644 --- a/security/selinux/selinuxfs.c +++ b/security/selinux/selinuxfs.c @@ -47,13 +47,7 @@ static char *policycap_names[] = { unsigned int selinux_checkreqprot = CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE; -#ifdef CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT -#define SELINUX_COMPAT_NET_VALUE 0 -#else -#define SELINUX_COMPAT_NET_VALUE 1 -#endif - -int selinux_compat_net = SELINUX_COMPAT_NET_VALUE; +int selinux_compat_net = 0; static int __init checkreqprot_setup(char *str) { @@ -494,7 +488,13 @@ static ssize_t sel_write_compat_net(struct file *file, const char __user *buf, if (sscanf(page, "%d", &new_value) != 1) goto out; - selinux_compat_net = new_value ? 1 : 0; + if (new_value) { + printk(KERN_NOTICE + "SELinux: compat_net is deprecated, please use secmark" + " instead\n"); + selinux_compat_net = 1; + } else + selinux_compat_net = 0; length = count; out: free_page((unsigned long) page); |
