| 1 |
commit: 1280d65a50cf19804497f782146cdf7a18715bf5 |
| 2 |
Author: cgzones <cgzones <AT> googlemail <DOT> com> |
| 3 |
AuthorDate: Sat Feb 18 21:47:11 2017 +0000 |
| 4 |
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Mar 30 13:58:38 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=1280d65a |
| 7 |
|
| 8 |
modutils: adopt calls to new interfaces |
| 9 |
|
| 10 |
policy/modules/contrib/aiccu.te | 2 +- |
| 11 |
policy/modules/contrib/anaconda.te | 3 +-- |
| 12 |
policy/modules/contrib/apm.te | 2 +- |
| 13 |
policy/modules/contrib/devicekit.te | 2 +- |
| 14 |
policy/modules/contrib/dpkg.te | 7 +++---- |
| 15 |
policy/modules/contrib/firewalld.te | 2 +- |
| 16 |
policy/modules/contrib/firstboot.te | 3 +-- |
| 17 |
policy/modules/contrib/hal.te | 2 +- |
| 18 |
policy/modules/contrib/jockey.te | 2 +- |
| 19 |
policy/modules/contrib/kdump.te | 2 +- |
| 20 |
policy/modules/contrib/kudzu.te | 2 +- |
| 21 |
policy/modules/contrib/ncftool.te | 2 +- |
| 22 |
policy/modules/contrib/networkmanager.te | 2 +- |
| 23 |
policy/modules/contrib/pcmcia.te | 2 +- |
| 24 |
policy/modules/contrib/portage.te | 3 +-- |
| 25 |
policy/modules/contrib/ppp.te | 2 +- |
| 26 |
policy/modules/contrib/ricci.te | 2 +- |
| 27 |
policy/modules/contrib/rpm.te | 3 +-- |
| 28 |
policy/modules/contrib/shorewall.te | 2 +- |
| 29 |
policy/modules/contrib/updfstab.te | 2 +- |
| 30 |
policy/modules/contrib/usernetctl.te | 2 +- |
| 31 |
policy/modules/contrib/vmware.te | 2 +- |
| 32 |
22 files changed, 24 insertions(+), 29 deletions(-) |
| 33 |
|
| 34 |
diff --git a/policy/modules/contrib/aiccu.te b/policy/modules/contrib/aiccu.te |
| 35 |
index 78c86532..27168e12 100644 |
| 36 |
--- a/policy/modules/contrib/aiccu.te |
| 37 |
+++ b/policy/modules/contrib/aiccu.te |
| 38 |
@@ -67,7 +67,7 @@ logging_send_syslog_msg(aiccu_t) |
| 39 |
miscfiles_read_localization(aiccu_t) |
| 40 |
|
| 41 |
optional_policy(` |
| 42 |
- modutils_domtrans_insmod(aiccu_t) |
| 43 |
+ modutils_domtrans(aiccu_t) |
| 44 |
') |
| 45 |
|
| 46 |
optional_policy(` |
| 47 |
|
| 48 |
diff --git a/policy/modules/contrib/anaconda.te b/policy/modules/contrib/anaconda.te |
| 49 |
index aa44abfe..009c772f 100644 |
| 50 |
--- a/policy/modules/contrib/anaconda.te |
| 51 |
+++ b/policy/modules/contrib/anaconda.te |
| 52 |
@@ -30,8 +30,7 @@ init_domtrans_script(anaconda_t) |
| 53 |
|
| 54 |
logging_send_syslog_msg(anaconda_t) |
| 55 |
|
| 56 |
-modutils_domtrans_insmod(anaconda_t) |
| 57 |
-modutils_domtrans_depmod(anaconda_t) |
| 58 |
+modutils_domtrans(anaconda_t) |
| 59 |
|
| 60 |
seutil_domtrans_semanage(anaconda_t) |
| 61 |
|
| 62 |
|
| 63 |
diff --git a/policy/modules/contrib/apm.te b/policy/modules/contrib/apm.te |
| 64 |
index c5647460..ede687d5 100644 |
| 65 |
--- a/policy/modules/contrib/apm.te |
| 66 |
+++ b/policy/modules/contrib/apm.te |
| 67 |
@@ -144,7 +144,7 @@ logging_send_syslog_msg(apmd_t) |
| 68 |
miscfiles_read_localization(apmd_t) |
| 69 |
miscfiles_read_hwdata(apmd_t) |
| 70 |
|
| 71 |
-modutils_domtrans_insmod(apmd_t) |
| 72 |
+modutils_domtrans(apmd_t) |
| 73 |
modutils_read_module_config(apmd_t) |
| 74 |
|
| 75 |
seutil_dontaudit_read_config(apmd_t) |
| 76 |
|
| 77 |
diff --git a/policy/modules/contrib/devicekit.te b/policy/modules/contrib/devicekit.te |
| 78 |
index 82ce25c3..baf9349c 100644 |
| 79 |
--- a/policy/modules/contrib/devicekit.te |
| 80 |
+++ b/policy/modules/contrib/devicekit.te |
| 81 |
@@ -315,7 +315,7 @@ optional_policy(` |
| 82 |
') |
| 83 |
|
| 84 |
optional_policy(` |
| 85 |
- modutils_domtrans_insmod(devicekit_power_t) |
| 86 |
+ modutils_domtrans(devicekit_power_t) |
| 87 |
') |
| 88 |
|
| 89 |
optional_policy(` |
| 90 |
|
| 91 |
diff --git a/policy/modules/contrib/dpkg.te b/policy/modules/contrib/dpkg.te |
| 92 |
index cc7f9dbb..5cc6ce3e 100644 |
| 93 |
--- a/policy/modules/contrib/dpkg.te |
| 94 |
+++ b/policy/modules/contrib/dpkg.te |
| 95 |
@@ -179,13 +179,13 @@ optional_policy(` |
| 96 |
') |
| 97 |
|
| 98 |
optional_policy(` |
| 99 |
- modutils_run_depmod(dpkg_t, dpkg_roles) |
| 100 |
- modutils_run_insmod(dpkg_t, dpkg_roles) |
| 101 |
+ modutils_run(dpkg_t, dpkg_roles) |
| 102 |
') |
| 103 |
|
| 104 |
optional_policy(` |
| 105 |
mta_send_mail(dpkg_t) |
| 106 |
') |
| 107 |
+ |
| 108 |
optional_policy(` |
| 109 |
usermanage_run_groupadd(dpkg_t, dpkg_roles) |
| 110 |
usermanage_run_useradd(dpkg_t, dpkg_roles) |
| 111 |
@@ -314,8 +314,7 @@ optional_policy(` |
| 112 |
') |
| 113 |
|
| 114 |
optional_policy(` |
| 115 |
- modutils_run_depmod(dpkg_script_t, dpkg_roles) |
| 116 |
- modutils_run_insmod(dpkg_script_t, dpkg_roles) |
| 117 |
+ modutils_run(dpkg_script_t, dpkg_roles) |
| 118 |
') |
| 119 |
|
| 120 |
optional_policy(` |
| 121 |
|
| 122 |
diff --git a/policy/modules/contrib/firewalld.te b/policy/modules/contrib/firewalld.te |
| 123 |
index 6ae370b7..991a1d65 100644 |
| 124 |
--- a/policy/modules/contrib/firewalld.te |
| 125 |
+++ b/policy/modules/contrib/firewalld.te |
| 126 |
@@ -101,7 +101,7 @@ optional_policy(` |
| 127 |
') |
| 128 |
|
| 129 |
optional_policy(` |
| 130 |
- modutils_domtrans_insmod(firewalld_t) |
| 131 |
+ modutils_domtrans(firewalld_t) |
| 132 |
') |
| 133 |
|
| 134 |
optional_policy(` |
| 135 |
|
| 136 |
diff --git a/policy/modules/contrib/firstboot.te b/policy/modules/contrib/firstboot.te |
| 137 |
index 5010f04e..3c39c258 100644 |
| 138 |
--- a/policy/modules/contrib/firstboot.te |
| 139 |
+++ b/policy/modules/contrib/firstboot.te |
| 140 |
@@ -95,8 +95,7 @@ optional_policy(` |
| 141 |
') |
| 142 |
|
| 143 |
optional_policy(` |
| 144 |
- modutils_domtrans_insmod(firstboot_t) |
| 145 |
- modutils_domtrans_depmod(firstboot_t) |
| 146 |
+ modutils_domtrans(firstboot_t) |
| 147 |
modutils_read_module_config(firstboot_t) |
| 148 |
modutils_read_module_deps(firstboot_t) |
| 149 |
') |
| 150 |
|
| 151 |
diff --git a/policy/modules/contrib/hal.te b/policy/modules/contrib/hal.te |
| 152 |
index 31035d15..99cd1293 100644 |
| 153 |
--- a/policy/modules/contrib/hal.te |
| 154 |
+++ b/policy/modules/contrib/hal.te |
| 155 |
@@ -197,7 +197,7 @@ logging_send_syslog_msg(hald_t) |
| 156 |
|
| 157 |
miscfiles_read_hwdata(hald_t) |
| 158 |
|
| 159 |
-modutils_domtrans_insmod(hald_t) |
| 160 |
+modutils_domtrans(hald_t) |
| 161 |
modutils_read_module_deps(hald_t) |
| 162 |
|
| 163 |
seutil_read_config(hald_t) |
| 164 |
|
| 165 |
diff --git a/policy/modules/contrib/jockey.te b/policy/modules/contrib/jockey.te |
| 166 |
index d59ec10a..8060276e 100644 |
| 167 |
--- a/policy/modules/contrib/jockey.te |
| 168 |
+++ b/policy/modules/contrib/jockey.te |
| 169 |
@@ -54,6 +54,6 @@ optional_policy(` |
| 170 |
') |
| 171 |
|
| 172 |
optional_policy(` |
| 173 |
- modutils_domtrans_insmod(jockey_t) |
| 174 |
+ modutils_domtrans(jockey_t) |
| 175 |
modutils_read_module_config(jockey_t) |
| 176 |
') |
| 177 |
|
| 178 |
diff --git a/policy/modules/contrib/kdump.te b/policy/modules/contrib/kdump.te |
| 179 |
index 9981dc55..ff9815b6 100644 |
| 180 |
--- a/policy/modules/contrib/kdump.te |
| 181 |
+++ b/policy/modules/contrib/kdump.te |
| 182 |
@@ -106,7 +106,7 @@ optional_policy(` |
| 183 |
') |
| 184 |
|
| 185 |
optional_policy(` |
| 186 |
- modutils_domtrans_insmod(kdumpctl_t) |
| 187 |
+ modutils_domtrans(kdumpctl_t) |
| 188 |
modutils_read_module_config(kdumpctl_t) |
| 189 |
') |
| 190 |
|
| 191 |
|
| 192 |
diff --git a/policy/modules/contrib/kudzu.te b/policy/modules/contrib/kudzu.te |
| 193 |
index 00b43648..8ff1088c 100644 |
| 194 |
--- a/policy/modules/contrib/kudzu.te |
| 195 |
+++ b/policy/modules/contrib/kudzu.te |
| 196 |
@@ -118,7 +118,7 @@ optional_policy(` |
| 197 |
modutils_read_module_deps(kudzu_t) |
| 198 |
modutils_rename_module_config(kudzu_t) |
| 199 |
modutils_delete_module_config(kudzu_t) |
| 200 |
- modutils_domtrans_insmod(kudzu_t) |
| 201 |
+ modutils_domtrans(kudzu_t) |
| 202 |
') |
| 203 |
|
| 204 |
optional_policy(` |
| 205 |
|
| 206 |
diff --git a/policy/modules/contrib/ncftool.te b/policy/modules/contrib/ncftool.te |
| 207 |
index 71f30ba6..95c16bef 100644 |
| 208 |
--- a/policy/modules/contrib/ncftool.te |
| 209 |
+++ b/policy/modules/contrib/ncftool.te |
| 210 |
@@ -77,7 +77,7 @@ optional_policy(` |
| 211 |
|
| 212 |
optional_policy(` |
| 213 |
modutils_read_module_config(ncftool_t) |
| 214 |
- modutils_run_insmod(ncftool_t, ncftool_roles) |
| 215 |
+ modutils_run(ncftool_t, ncftool_roles) |
| 216 |
') |
| 217 |
|
| 218 |
optional_policy(` |
| 219 |
|
| 220 |
diff --git a/policy/modules/contrib/networkmanager.te b/policy/modules/contrib/networkmanager.te |
| 221 |
index 1e3237e5..caa8bcfd 100644 |
| 222 |
--- a/policy/modules/contrib/networkmanager.te |
| 223 |
+++ b/policy/modules/contrib/networkmanager.te |
| 224 |
@@ -285,7 +285,7 @@ optional_policy(` |
| 225 |
') |
| 226 |
|
| 227 |
optional_policy(` |
| 228 |
- modutils_domtrans_insmod(NetworkManager_t) |
| 229 |
+ modutils_domtrans(NetworkManager_t) |
| 230 |
') |
| 231 |
|
| 232 |
optional_policy(` |
| 233 |
|
| 234 |
diff --git a/policy/modules/contrib/pcmcia.te b/policy/modules/contrib/pcmcia.te |
| 235 |
index 230f1f00..c1dd9490 100644 |
| 236 |
--- a/policy/modules/contrib/pcmcia.te |
| 237 |
+++ b/policy/modules/contrib/pcmcia.te |
| 238 |
@@ -90,7 +90,7 @@ logging_send_syslog_msg(cardmgr_t) |
| 239 |
|
| 240 |
miscfiles_read_localization(cardmgr_t) |
| 241 |
|
| 242 |
-modutils_domtrans_insmod(cardmgr_t) |
| 243 |
+modutils_domtrans(cardmgr_t) |
| 244 |
|
| 245 |
sysnet_domtrans_ifconfig(cardmgr_t) |
| 246 |
sysnet_etc_filetrans_config(cardmgr_t) |
| 247 |
|
| 248 |
diff --git a/policy/modules/contrib/portage.te b/policy/modules/contrib/portage.te |
| 249 |
index 114a0fe4..e5c1cb9d 100644 |
| 250 |
--- a/policy/modules/contrib/portage.te |
| 251 |
+++ b/policy/modules/contrib/portage.te |
| 252 |
@@ -222,8 +222,7 @@ optional_policy(` |
| 253 |
') |
| 254 |
|
| 255 |
optional_policy(` |
| 256 |
- modutils_run_depmod(portage_t, portage_roles) |
| 257 |
- modutils_run_update_mods(portage_t, portage_roles) |
| 258 |
+ modutils_run(portage_t, portage_roles) |
| 259 |
#dontaudit update_modules_t portage_tmp_t:dir search_dir_perms; |
| 260 |
') |
| 261 |
|
| 262 |
|
| 263 |
diff --git a/policy/modules/contrib/ppp.te b/policy/modules/contrib/ppp.te |
| 264 |
index 740e03fc..7b9093af 100644 |
| 265 |
--- a/policy/modules/contrib/ppp.te |
| 266 |
+++ b/policy/modules/contrib/ppp.te |
| 267 |
@@ -193,7 +193,7 @@ optional_policy(` |
| 268 |
|
| 269 |
optional_policy(` |
| 270 |
tunable_policy(`pppd_can_insmod',` |
| 271 |
- modutils_domtrans_insmod(pppd_t) |
| 272 |
+ modutils_domtrans(pppd_t) |
| 273 |
') |
| 274 |
') |
| 275 |
|
| 276 |
|
| 277 |
diff --git a/policy/modules/contrib/ricci.te b/policy/modules/contrib/ricci.te |
| 278 |
index 326d7b85..12b6bcc6 100644 |
| 279 |
--- a/policy/modules/contrib/ricci.te |
| 280 |
+++ b/policy/modules/contrib/ricci.te |
| 281 |
@@ -255,7 +255,7 @@ optional_policy(` |
| 282 |
') |
| 283 |
|
| 284 |
optional_policy(` |
| 285 |
- modutils_domtrans_insmod(ricci_modcluster_t) |
| 286 |
+ modutils_domtrans(ricci_modcluster_t) |
| 287 |
') |
| 288 |
|
| 289 |
optional_policy(` |
| 290 |
|
| 291 |
diff --git a/policy/modules/contrib/rpm.te b/policy/modules/contrib/rpm.te |
| 292 |
index 1b36d097..3f620534 100644 |
| 293 |
--- a/policy/modules/contrib/rpm.te |
| 294 |
+++ b/policy/modules/contrib/rpm.te |
| 295 |
@@ -350,8 +350,7 @@ logging_send_syslog_msg(rpm_script_t) |
| 296 |
|
| 297 |
miscfiles_read_localization(rpm_script_t) |
| 298 |
|
| 299 |
-modutils_run_depmod(rpm_script_t, rpm_roles) |
| 300 |
-modutils_run_insmod(rpm_script_t, rpm_roles) |
| 301 |
+modutils_run(rpm_script_t, rpm_roles) |
| 302 |
|
| 303 |
seutil_run_loadpolicy(rpm_script_t, rpm_roles) |
| 304 |
seutil_run_setfiles(rpm_script_t, rpm_roles) |
| 305 |
|
| 306 |
diff --git a/policy/modules/contrib/shorewall.te b/policy/modules/contrib/shorewall.te |
| 307 |
index 5e815dd8..3222f01c 100644 |
| 308 |
--- a/policy/modules/contrib/shorewall.te |
| 309 |
+++ b/policy/modules/contrib/shorewall.te |
| 310 |
@@ -106,7 +106,7 @@ optional_policy(` |
| 311 |
') |
| 312 |
|
| 313 |
optional_policy(` |
| 314 |
- modutils_domtrans_insmod(shorewall_t) |
| 315 |
+ modutils_domtrans(shorewall_t) |
| 316 |
') |
| 317 |
|
| 318 |
optional_policy(` |
| 319 |
|
| 320 |
diff --git a/policy/modules/contrib/updfstab.te b/policy/modules/contrib/updfstab.te |
| 321 |
index 5ceb9124..5aa33bfd 100644 |
| 322 |
--- a/policy/modules/contrib/updfstab.te |
| 323 |
+++ b/policy/modules/contrib/updfstab.te |
| 324 |
@@ -99,7 +99,7 @@ optional_policy(` |
| 325 |
|
| 326 |
optional_policy(` |
| 327 |
modutils_read_module_config(updfstab_t) |
| 328 |
- modutils_exec_insmod(updfstab_t) |
| 329 |
+ modutils_exec(updfstab_t) |
| 330 |
modutils_read_module_deps(updfstab_t) |
| 331 |
') |
| 332 |
|
| 333 |
|
| 334 |
diff --git a/policy/modules/contrib/usernetctl.te b/policy/modules/contrib/usernetctl.te |
| 335 |
index 3f774951..c5832ef2 100644 |
| 336 |
--- a/policy/modules/contrib/usernetctl.te |
| 337 |
+++ b/policy/modules/contrib/usernetctl.te |
| 338 |
@@ -70,7 +70,7 @@ optional_policy(` |
| 339 |
') |
| 340 |
|
| 341 |
optional_policy(` |
| 342 |
- modutils_run_insmod(usernetctl_t, usernetctl_roles) |
| 343 |
+ modutils_run(usernetctl_t, usernetctl_roles) |
| 344 |
') |
| 345 |
|
| 346 |
optional_policy(` |
| 347 |
|
| 348 |
diff --git a/policy/modules/contrib/vmware.te b/policy/modules/contrib/vmware.te |
| 349 |
index 59a32f5d..7dbcd40e 100644 |
| 350 |
--- a/policy/modules/contrib/vmware.te |
| 351 |
+++ b/policy/modules/contrib/vmware.te |
| 352 |
@@ -157,7 +157,7 @@ optional_policy(` |
| 353 |
') |
| 354 |
|
| 355 |
optional_policy(` |
| 356 |
- modutils_domtrans_insmod(vmware_host_t) |
| 357 |
+ modutils_domtrans(vmware_host_t) |
| 358 |
') |
| 359 |
|
| 360 |
optional_policy(` |
Archives