| 1 |
commit: 36e2216f82192660d063012e69281f27ba20864b |
| 2 |
Author: Dominick Grift <dominick.grift <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri Sep 27 21:33:49 2013 +0000 |
| 4 |
Commit: Sven Vermeulen <swift <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 30 19:03:08 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=36e2216f |
| 7 |
|
| 8 |
various: revert regex fixes: fcsort does not want this now |
| 9 |
|
| 10 |
Signed-off-by: Dominick Grift <dominick.grift <AT> gmail.com> |
| 11 |
|
| 12 |
--- |
| 13 |
policy/modules/contrib/aide.fc | 3 ++- |
| 14 |
policy/modules/contrib/amtu.fc | 3 ++- |
| 15 |
policy/modules/contrib/ircd.fc | 4 +++- |
| 16 |
policy/modules/contrib/nagios.fc | 7 +++++-- |
| 17 |
policy/modules/contrib/networkmanager.fc | 14 +++++++++----- |
| 18 |
policy/modules/contrib/puppet.fc | 10 +++++++--- |
| 19 |
policy/modules/contrib/snort.fc | 4 +++- |
| 20 |
policy/modules/contrib/tor.fc | 3 ++- |
| 21 |
policy/modules/contrib/zabbix.fc | 13 ++++++++----- |
| 22 |
9 files changed, 41 insertions(+), 20 deletions(-) |
| 23 |
|
| 24 |
diff --git a/policy/modules/contrib/aide.fc b/policy/modules/contrib/aide.fc |
| 25 |
index 06f050f..b2f47de 100644 |
| 26 |
--- a/policy/modules/contrib/aide.fc |
| 27 |
+++ b/policy/modules/contrib/aide.fc |
| 28 |
@@ -1,4 +1,5 @@ |
| 29 |
-/usr/(s)?bin/aide -- gen_context(system_u:object_r:aide_exec_t,mls_systemhigh) |
| 30 |
+/usr/bin/aide -- gen_context(system_u:object_r:aide_exec_t,mls_systemhigh) |
| 31 |
+/usr/sbin/aide -- gen_context(system_u:object_r:aide_exec_t,mls_systemhigh) |
| 32 |
|
| 33 |
/var/lib/aide(/.*)? gen_context(system_u:object_r:aide_db_t,mls_systemhigh) |
| 34 |
|
| 35 |
|
| 36 |
diff --git a/policy/modules/contrib/amtu.fc b/policy/modules/contrib/amtu.fc |
| 37 |
index 305a1a0..b21a14a 100644 |
| 38 |
--- a/policy/modules/contrib/amtu.fc |
| 39 |
+++ b/policy/modules/contrib/amtu.fc |
| 40 |
@@ -1,3 +1,4 @@ |
| 41 |
/etc/rc\.d/init\.d/amtu -- gen_context(system_u:object_r:amtu_initrc_exec_t,s0) |
| 42 |
|
| 43 |
-/usr/(s)?bin/amtu -- gen_context(system_u:object_r:amtu_exec_t,s0) |
| 44 |
+/usr/bin/amtu -- gen_context(system_u:object_r:amtu_exec_t,s0) |
| 45 |
+/usr/sbin/amtu -- gen_context(system_u:object_r:amtu_exec_t,s0) |
| 46 |
|
| 47 |
diff --git a/policy/modules/contrib/ircd.fc b/policy/modules/contrib/ircd.fc |
| 48 |
index 8060f08..f37eed8 100644 |
| 49 |
--- a/policy/modules/contrib/ircd.fc |
| 50 |
+++ b/policy/modules/contrib/ircd.fc |
| 51 |
@@ -5,8 +5,10 @@ |
| 52 |
|
| 53 |
/etc/rc\.d/init\.d/((ircd)|(ngircd)|(dancer-ircd)) -- gen_context(system_u:object_r:ircd_initrc_exec_t,s0) |
| 54 |
|
| 55 |
+/usr/bin/ircd -- gen_context(system_u:object_r:ircd_exec_t,s0) |
| 56 |
+ |
| 57 |
/usr/sbin/dancer-ircd -- gen_context(system_u:object_r:ircd_exec_t,s0) |
| 58 |
-/usr/(s)?bin/ircd -- gen_context(system_u:object_r:ircd_exec_t,s0) |
| 59 |
+/usr/sbin/ircd -- gen_context(system_u:object_r:ircd_exec_t,s0) |
| 60 |
/usr/sbin/ngircd -- gen_context(system_u:object_r:ircd_exec_t,s0) |
| 61 |
|
| 62 |
/var/lib/dancer-ircd(/.*)? gen_context(system_u:object_r:ircd_var_lib_t,s0) |
| 63 |
|
| 64 |
diff --git a/policy/modules/contrib/nagios.fc b/policy/modules/contrib/nagios.fc |
| 65 |
index 5e47e3f..d78dfc3 100644 |
| 66 |
--- a/policy/modules/contrib/nagios.fc |
| 67 |
+++ b/policy/modules/contrib/nagios.fc |
| 68 |
@@ -4,8 +4,11 @@ |
| 69 |
/etc/rc\.d/init\.d/nagios -- gen_context(system_u:object_r:nagios_initrc_exec_t,s0) |
| 70 |
/etc/rc\.d/init\.d/nrpe -- gen_context(system_u:object_r:nagios_initrc_exec_t,s0) |
| 71 |
|
| 72 |
-/usr/(s)?bin/nagios -- gen_context(system_u:object_r:nagios_exec_t,s0) |
| 73 |
-/usr/(s)?bin/nrpe -- gen_context(system_u:object_r:nrpe_exec_t,s0) |
| 74 |
+/usr/bin/nagios -- gen_context(system_u:object_r:nagios_exec_t,s0) |
| 75 |
+/usr/bin/nrpe -- gen_context(system_u:object_r:nrpe_exec_t,s0) |
| 76 |
+ |
| 77 |
+/usr/sbin/nagios -- gen_context(system_u:object_r:nagios_exec_t,s0) |
| 78 |
+/usr/sbin/nrpe -- gen_context(system_u:object_r:nrpe_exec_t,s0) |
| 79 |
|
| 80 |
/usr/lib/cgi-bin/nagios(/.*)? gen_context(system_u:object_r:httpd_nagios_script_exec_t,s0) |
| 81 |
/usr/lib/cgi-bin/netsaint(/.*)? gen_context(system_u:object_r:httpd_nagios_script_exec_t,s0) |
| 82 |
|
| 83 |
diff --git a/policy/modules/contrib/networkmanager.fc b/policy/modules/contrib/networkmanager.fc |
| 84 |
index a697d60..7b80c1e 100644 |
| 85 |
--- a/policy/modules/contrib/networkmanager.fc |
| 86 |
+++ b/policy/modules/contrib/networkmanager.fc |
| 87 |
@@ -16,15 +16,19 @@ |
| 88 |
/usr/lib/NetworkManager/nm-dispatcher\.action -- gen_context(system_u:object_r:NetworkManager_initrc_exec_t,s0) |
| 89 |
/usr/libexec/nm-dispatcher\.action -- gen_context(system_u:object_r:NetworkManager_initrc_exec_t,s0) |
| 90 |
|
| 91 |
-/(s)?bin/wpa_cli -- gen_context(system_u:object_r:wpa_cli_exec_t,s0) |
| 92 |
-/(s)?bin/wpa_supplicant -- gen_context(system_u:object_r:NetworkManager_exec_t,s0) |
| 93 |
+/sbin/wpa_cli -- gen_context(system_u:object_r:wpa_cli_exec_t,s0) |
| 94 |
+/sbin/wpa_supplicant -- gen_context(system_u:object_r:NetworkManager_exec_t,s0) |
| 95 |
|
| 96 |
-/usr/(s)?bin/NetworkManager -- gen_context(system_u:object_r:NetworkManager_exec_t,s0) |
| 97 |
+/usr/bin/NetworkManager -- gen_context(system_u:object_r:NetworkManager_exec_t,s0) |
| 98 |
+/usr/bin/wpa_cli -- gen_context(system_u:object_r:wpa_cli_exec_t,s0) |
| 99 |
+/usr/bin/wpa_supplicant -- gen_context(system_u:object_r:NetworkManager_exec_t,s0) |
| 100 |
+ |
| 101 |
+/usr/sbin/NetworkManager -- gen_context(system_u:object_r:NetworkManager_exec_t,s0) |
| 102 |
/usr/sbin/NetworkManagerDispatcher -- gen_context(system_u:object_r:NetworkManager_exec_t,s0) |
| 103 |
/usr/sbin/nm-system-settings -- gen_context(system_u:object_r:NetworkManager_exec_t,s0) |
| 104 |
/usr/sbin/wicd -- gen_context(system_u:object_r:NetworkManager_exec_t,s0) |
| 105 |
-/usr/(s)?bin/wpa_cli -- gen_context(system_u:object_r:wpa_cli_exec_t,s0) |
| 106 |
-/usr/(s)?bin/wpa_supplicant -- gen_context(system_u:object_r:NetworkManager_exec_t,s0) |
| 107 |
+/usr/sbin/wpa_cli -- gen_context(system_u:object_r:wpa_cli_exec_t,s0) |
| 108 |
+/usr/sbin/wpa_supplicant -- gen_context(system_u:object_r:NetworkManager_exec_t,s0) |
| 109 |
|
| 110 |
/var/lib/wicd(/.*)? gen_context(system_u:object_r:NetworkManager_var_lib_t,s0) |
| 111 |
/var/lib/NetworkManager(/.*)? gen_context(system_u:object_r:NetworkManager_var_lib_t,s0) |
| 112 |
|
| 113 |
diff --git a/policy/modules/contrib/puppet.fc b/policy/modules/contrib/puppet.fc |
| 114 |
index 5a6da67..d68e26d 100644 |
| 115 |
--- a/policy/modules/contrib/puppet.fc |
| 116 |
+++ b/policy/modules/contrib/puppet.fc |
| 117 |
@@ -3,9 +3,13 @@ |
| 118 |
/etc/rc\.d/init\.d/puppet -- gen_context(system_u:object_r:puppet_initrc_exec_t,s0) |
| 119 |
/etc/rc\.d/init\.d/puppetmaster -- gen_context(system_u:object_r:puppetmaster_initrc_exec_t,s0) |
| 120 |
|
| 121 |
-/usr/(s)?bin/puppetca -- gen_context(system_u:object_r:puppetca_exec_t,s0) |
| 122 |
-/usr/(s)?bin/puppetd -- gen_context(system_u:object_r:puppet_exec_t,s0) |
| 123 |
-/usr/(s)?bin/puppetmasterd -- gen_context(system_u:object_r:puppetmaster_exec_t,s0) |
| 124 |
+/usr/bin/puppetca -- gen_context(system_u:object_r:puppetca_exec_t,s0) |
| 125 |
+/usr/bin/puppetd -- gen_context(system_u:object_r:puppet_exec_t,s0) |
| 126 |
+/usr/bin/puppetmasterd -- gen_context(system_u:object_r:puppetmaster_exec_t,s0) |
| 127 |
+ |
| 128 |
+/usr/sbin/puppetca -- gen_context(system_u:object_r:puppetca_exec_t,s0) |
| 129 |
+/usr/sbin/puppetd -- gen_context(system_u:object_r:puppet_exec_t,s0) |
| 130 |
+/usr/sbin/puppetmasterd -- gen_context(system_u:object_r:puppetmaster_exec_t,s0) |
| 131 |
|
| 132 |
/var/lib/puppet(/.*)? gen_context(system_u:object_r:puppet_var_lib_t,s0) |
| 133 |
|
| 134 |
|
| 135 |
diff --git a/policy/modules/contrib/snort.fc b/policy/modules/contrib/snort.fc |
| 136 |
index aae25d9..591b9a1 100644 |
| 137 |
--- a/policy/modules/contrib/snort.fc |
| 138 |
+++ b/policy/modules/contrib/snort.fc |
| 139 |
@@ -2,7 +2,9 @@ |
| 140 |
|
| 141 |
/etc/snort(/.*)? gen_context(system_u:object_r:snort_etc_t,s0) |
| 142 |
|
| 143 |
-/usr/(s)?bin/snort -- gen_context(system_u:object_r:snort_exec_t,s0) |
| 144 |
+/usr/bin/snort -- gen_context(system_u:object_r:snort_exec_t,s0) |
| 145 |
+/usr/sbin/snort -- gen_context(system_u:object_r:snort_exec_t,s0) |
| 146 |
+ |
| 147 |
/usr/sbin/snort-plain -- gen_context(system_u:object_r:snort_exec_t,s0) |
| 148 |
|
| 149 |
/var/log/snort(/.*)? gen_context(system_u:object_r:snort_log_t,s0) |
| 150 |
|
| 151 |
diff --git a/policy/modules/contrib/tor.fc b/policy/modules/contrib/tor.fc |
| 152 |
index 14a355a..dce42ec 100644 |
| 153 |
--- a/policy/modules/contrib/tor.fc |
| 154 |
+++ b/policy/modules/contrib/tor.fc |
| 155 |
@@ -2,7 +2,8 @@ |
| 156 |
|
| 157 |
/etc/rc\.d/init\.d/tor -- gen_context(system_u:object_r:tor_initrc_exec_t,s0) |
| 158 |
|
| 159 |
-/usr/(s)?bin/tor -- gen_context(system_u:object_r:tor_exec_t,s0) |
| 160 |
+/usr/bin/tor -- gen_context(system_u:object_r:tor_exec_t,s0) |
| 161 |
+/usr/sbin/tor -- gen_context(system_u:object_r:tor_exec_t,s0) |
| 162 |
|
| 163 |
/var/lib/tor(/.*)? gen_context(system_u:object_r:tor_var_lib_t,s0) |
| 164 |
/var/lib/tor-data(/.*)? gen_context(system_u:object_r:tor_var_lib_t,s0) |
| 165 |
|
| 166 |
diff --git a/policy/modules/contrib/zabbix.fc b/policy/modules/contrib/zabbix.fc |
| 167 |
index f83008c..c3b5a81 100644 |
| 168 |
--- a/policy/modules/contrib/zabbix.fc |
| 169 |
+++ b/policy/modules/contrib/zabbix.fc |
| 170 |
@@ -1,11 +1,14 @@ |
| 171 |
/etc/rc\.d/init\.d/(zabbix|zabbix-server) -- gen_context(system_u:object_r:zabbix_initrc_exec_t,s0) |
| 172 |
/etc/rc\.d/init\.d/zabbix-agentd -- gen_context(system_u:object_r:zabbix_agent_initrc_exec_t,s0) |
| 173 |
|
| 174 |
-/usr/s?bin/zabbix_server -- gen_context(system_u:object_r:zabbix_exec_t,s0) |
| 175 |
-/usr/s?bin/zabbix_agentd -- gen_context(system_u:object_r:zabbix_agent_exec_t,s0) |
| 176 |
-/usr/s?bin/zabbix_server_mysql -- gen_context(system_u:object_r:zabbix_exec_t,s0) |
| 177 |
-/usr/s?bin/zabbix_server_pgsql -- gen_context(system_u:object_r:zabbix_exec_t,s0) |
| 178 |
-/usr/s?bin/zabbix_server_sqlite3 -- gen_context(system_u:object_r:zabbix_exec_t,s0) |
| 179 |
+/usr/bin/zabbix_server -- gen_context(system_u:object_r:zabbix_exec_t,s0) |
| 180 |
+/usr/bin/zabbix_agentd -- gen_context(system_u:object_r:zabbix_agent_exec_t,s0) |
| 181 |
+ |
| 182 |
+/usr/sbin/zabbix_server -- gen_context(system_u:object_r:zabbix_exec_t,s0) |
| 183 |
+/usr/sbin/zabbix_agentd -- gen_context(system_u:object_r:zabbix_agent_exec_t,s0) |
| 184 |
+/usr/sbin/zabbix_server_mysql -- gen_context(system_u:object_r:zabbix_exec_t,s0) |
| 185 |
+/usr/sbin/zabbix_server_pgsql -- gen_context(system_u:object_r:zabbix_exec_t,s0) |
| 186 |
+/usr/sbin/zabbix_server_sqlite3 -- gen_context(system_u:object_r:zabbix_exec_t,s0) |
| 187 |
|
| 188 |
/var/log/zabbix(/.*)? gen_context(system_u:object_r:zabbix_log_t,s0) |
Archives