diff options
| author | James Morris <james.l.morris@oracle.com> | 2013-10-22 22:26:41 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2013-10-22 22:26:41 +1100 |
| commit | 6f799c97f37fc0ee2c9c427fa0dada637394886c (patch) | |
| tree | 1953a953770b8047a95ef4d431bb693433922043 /security/selinux/selinuxfs.c | |
| parent | eb8948a03704f3dbbfc7e83090e20e93c6c476d2 (diff) | |
| parent | 42d64e1add3a1ce8a787116036163b8724362145 (diff) | |
| download | talos-obmc-linux-6f799c97f37fc0ee2c9c427fa0dada637394886c.tar.gz talos-obmc-linux-6f799c97f37fc0ee2c9c427fa0dada637394886c.zip | |
Merge branch 'master' of git://git.infradead.org/users/pcmoore/selinux into ra-next
Diffstat (limited to 'security/selinux/selinuxfs.c')
| -rw-r--r-- | security/selinux/selinuxfs.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c index ff427733c290..5122affe06a8 100644 --- a/security/selinux/selinuxfs.c +++ b/security/selinux/selinuxfs.c @@ -44,7 +44,9 @@ /* Policy capability filenames */ static char *policycap_names[] = { "network_peer_controls", - "open_perms" + "open_perms", + "redhat1", + "always_check_network" }; unsigned int selinux_checkreqprot = CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE; |
