commit: 1280d65a50cf19804497f782146cdf7a18715bf5
Author: cgzones <cgzones <AT> googlemail <DOT> com>
AuthorDate: Sat Feb 18 21:47:11 2017 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Thu Mar 30 13:58:38 2017 +0000
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=1280d65a
modutils: adopt calls to new interfaces
policy/modules/contrib/aiccu.te | 2 +-
policy/modules/contrib/anaconda.te | 3 +--
policy/modules/contrib/apm.te | 2 +-
policy/modules/contrib/devicekit.te | 2 +-
policy/modules/contrib/dpkg.te | 7 +++----
policy/modules/contrib/firewalld.te | 2 +-
policy/modules/contrib/firstboot.te | 3 +--
policy/modules/contrib/hal.te | 2 +-
policy/modules/contrib/jockey.te | 2 +-
policy/modules/contrib/kdump.te | 2 +-
policy/modules/contrib/kudzu.te | 2 +-
policy/modules/contrib/ncftool.te | 2 +-
policy/modules/contrib/networkmanager.te | 2 +-
policy/modules/contrib/pcmcia.te | 2 +-
policy/modules/contrib/portage.te | 3 +--
policy/modules/contrib/ppp.te | 2 +-
policy/modules/contrib/ricci.te | 2 +-
policy/modules/contrib/rpm.te | 3 +--
policy/modules/contrib/shorewall.te | 2 +-
policy/modules/contrib/updfstab.te | 2 +-
policy/modules/contrib/usernetctl.te | 2 +-
policy/modules/contrib/vmware.te | 2 +-
22 files changed, 24 insertions(+), 29 deletions(-)
diff --git a/policy/modules/contrib/aiccu.te b/policy/modules/contrib/aiccu.te
index 78c86532..27168e12 100644
--- a/policy/modules/contrib/aiccu.te
+++ b/policy/modules/contrib/aiccu.te
@@ -67,7 +67,7 @@ logging_send_syslog_msg(aiccu_t)
miscfiles_read_localization(aiccu_t)
optional_policy(`
- modutils_domtrans_insmod(aiccu_t)
+ modutils_domtrans(aiccu_t)
')
optional_policy(`
diff --git a/policy/modules/contrib/anaconda.te
b/policy/modules/contrib/anaconda.te
index aa44abfe..009c772f 100644
--- a/policy/modules/contrib/anaconda.te
+++ b/policy/modules/contrib/anaconda.te
@@ -30,8 +30,7 @@ init_domtrans_script(anaconda_t)
logging_send_syslog_msg(anaconda_t)
-modutils_domtrans_insmod(anaconda_t)
-modutils_domtrans_depmod(anaconda_t)
+modutils_domtrans(anaconda_t)
seutil_domtrans_semanage(anaconda_t)
diff --git a/policy/modules/contrib/apm.te b/policy/modules/contrib/apm.te
index c5647460..ede687d5 100644
--- a/policy/modules/contrib/apm.te
+++ b/policy/modules/contrib/apm.te
@@ -144,7 +144,7 @@ logging_send_syslog_msg(apmd_t)
miscfiles_read_localization(apmd_t)
miscfiles_read_hwdata(apmd_t)
-modutils_domtrans_insmod(apmd_t)
+modutils_domtrans(apmd_t)
modutils_read_module_config(apmd_t)
seutil_dontaudit_read_config(apmd_t)
diff --git a/policy/modules/contrib/devicekit.te
b/policy/modules/contrib/devicekit.te
index 82ce25c3..baf9349c 100644
--- a/policy/modules/contrib/devicekit.te
+++ b/policy/modules/contrib/devicekit.te
@@ -315,7 +315,7 @@ optional_policy(`
')
optional_policy(`
- modutils_domtrans_insmod(devicekit_power_t)
+ modutils_domtrans(devicekit_power_t)
')
optional_policy(`
diff --git a/policy/modules/contrib/dpkg.te b/policy/modules/contrib/dpkg.te
index cc7f9dbb..5cc6ce3e 100644
--- a/policy/modules/contrib/dpkg.te
+++ b/policy/modules/contrib/dpkg.te
@@ -179,13 +179,13 @@ optional_policy(`
')
optional_policy(`
- modutils_run_depmod(dpkg_t, dpkg_roles)
- modutils_run_insmod(dpkg_t, dpkg_roles)
+ modutils_run(dpkg_t, dpkg_roles)
')
optional_policy(`
mta_send_mail(dpkg_t)
')
+
optional_policy(`
usermanage_run_groupadd(dpkg_t, dpkg_roles)
usermanage_run_useradd(dpkg_t, dpkg_roles)
@@ -314,8 +314,7 @@ optional_policy(`
')
optional_policy(`
- modutils_run_depmod(dpkg_script_t, dpkg_roles)
- modutils_run_insmod(dpkg_script_t, dpkg_roles)
+ modutils_run(dpkg_script_t, dpkg_roles)
')
optional_policy(`
diff --git a/policy/modules/contrib/firewalld.te
b/policy/modules/contrib/firewalld.te
index 6ae370b7..991a1d65 100644
--- a/policy/modules/contrib/firewalld.te
+++ b/policy/modules/contrib/firewalld.te
@@ -101,7 +101,7 @@ optional_policy(`
')
optional_policy(`
- modutils_domtrans_insmod(firewalld_t)
+ modutils_domtrans(firewalld_t)
')
optional_policy(`
diff --git a/policy/modules/contrib/firstboot.te
b/policy/modules/contrib/firstboot.te
index 5010f04e..3c39c258 100644
--- a/policy/modules/contrib/firstboot.te
+++ b/policy/modules/contrib/firstboot.te
@@ -95,8 +95,7 @@ optional_policy(`
')
optional_policy(`
- modutils_domtrans_insmod(firstboot_t)
- modutils_domtrans_depmod(firstboot_t)
+ modutils_domtrans(firstboot_t)
modutils_read_module_config(firstboot_t)
modutils_read_module_deps(firstboot_t)
')
diff --git a/policy/modules/contrib/hal.te b/policy/modules/contrib/hal.te
index 31035d15..99cd1293 100644
--- a/policy/modules/contrib/hal.te
+++ b/policy/modules/contrib/hal.te
@@ -197,7 +197,7 @@ logging_send_syslog_msg(hald_t)
miscfiles_read_hwdata(hald_t)
-modutils_domtrans_insmod(hald_t)
+modutils_domtrans(hald_t)
modutils_read_module_deps(hald_t)
seutil_read_config(hald_t)
diff --git a/policy/modules/contrib/jockey.te b/policy/modules/contrib/jockey.te
index d59ec10a..8060276e 100644
--- a/policy/modules/contrib/jockey.te
+++ b/policy/modules/contrib/jockey.te
@@ -54,6 +54,6 @@ optional_policy(`
')
optional_policy(`
- modutils_domtrans_insmod(jockey_t)
+ modutils_domtrans(jockey_t)
modutils_read_module_config(jockey_t)
')
diff --git a/policy/modules/contrib/kdump.te b/policy/modules/contrib/kdump.te
index 9981dc55..ff9815b6 100644
--- a/policy/modules/contrib/kdump.te
+++ b/policy/modules/contrib/kdump.te
@@ -106,7 +106,7 @@ optional_policy(`
')
optional_policy(`
- modutils_domtrans_insmod(kdumpctl_t)
+ modutils_domtrans(kdumpctl_t)
modutils_read_module_config(kdumpctl_t)
')
diff --git a/policy/modules/contrib/kudzu.te b/policy/modules/contrib/kudzu.te
index 00b43648..8ff1088c 100644
--- a/policy/modules/contrib/kudzu.te
+++ b/policy/modules/contrib/kudzu.te
@@ -118,7 +118,7 @@ optional_policy(`
modutils_read_module_deps(kudzu_t)
modutils_rename_module_config(kudzu_t)
modutils_delete_module_config(kudzu_t)
- modutils_domtrans_insmod(kudzu_t)
+ modutils_domtrans(kudzu_t)
')
optional_policy(`
diff --git a/policy/modules/contrib/ncftool.te
b/policy/modules/contrib/ncftool.te
index 71f30ba6..95c16bef 100644
--- a/policy/modules/contrib/ncftool.te
+++ b/policy/modules/contrib/ncftool.te
@@ -77,7 +77,7 @@ optional_policy(`
optional_policy(`
modutils_read_module_config(ncftool_t)
- modutils_run_insmod(ncftool_t, ncftool_roles)
+ modutils_run(ncftool_t, ncftool_roles)
')
optional_policy(`
diff --git a/policy/modules/contrib/networkmanager.te
b/policy/modules/contrib/networkmanager.te
index 1e3237e5..caa8bcfd 100644
--- a/policy/modules/contrib/networkmanager.te
+++ b/policy/modules/contrib/networkmanager.te
@@ -285,7 +285,7 @@ optional_policy(`
')
optional_policy(`
- modutils_domtrans_insmod(NetworkManager_t)
+ modutils_domtrans(NetworkManager_t)
')
optional_policy(`
diff --git a/policy/modules/contrib/pcmcia.te b/policy/modules/contrib/pcmcia.te
index 230f1f00..c1dd9490 100644
--- a/policy/modules/contrib/pcmcia.te
+++ b/policy/modules/contrib/pcmcia.te
@@ -90,7 +90,7 @@ logging_send_syslog_msg(cardmgr_t)
miscfiles_read_localization(cardmgr_t)
-modutils_domtrans_insmod(cardmgr_t)
+modutils_domtrans(cardmgr_t)
sysnet_domtrans_ifconfig(cardmgr_t)
sysnet_etc_filetrans_config(cardmgr_t)
diff --git a/policy/modules/contrib/portage.te
b/policy/modules/contrib/portage.te
index 114a0fe4..e5c1cb9d 100644
--- a/policy/modules/contrib/portage.te
+++ b/policy/modules/contrib/portage.te
@@ -222,8 +222,7 @@ optional_policy(`
')
optional_policy(`
- modutils_run_depmod(portage_t, portage_roles)
- modutils_run_update_mods(portage_t, portage_roles)
+ modutils_run(portage_t, portage_roles)
#dontaudit update_modules_t portage_tmp_t:dir search_dir_perms;
')
diff --git a/policy/modules/contrib/ppp.te b/policy/modules/contrib/ppp.te
index 740e03fc..7b9093af 100644
--- a/policy/modules/contrib/ppp.te
+++ b/policy/modules/contrib/ppp.te
@@ -193,7 +193,7 @@ optional_policy(`
optional_policy(`
tunable_policy(`pppd_can_insmod',`
- modutils_domtrans_insmod(pppd_t)
+ modutils_domtrans(pppd_t)
')
')
diff --git a/policy/modules/contrib/ricci.te b/policy/modules/contrib/ricci.te
index 326d7b85..12b6bcc6 100644
--- a/policy/modules/contrib/ricci.te
+++ b/policy/modules/contrib/ricci.te
@@ -255,7 +255,7 @@ optional_policy(`
')
optional_policy(`
- modutils_domtrans_insmod(ricci_modcluster_t)
+ modutils_domtrans(ricci_modcluster_t)
')
optional_policy(`
diff --git a/policy/modules/contrib/rpm.te b/policy/modules/contrib/rpm.te
index 1b36d097..3f620534 100644
--- a/policy/modules/contrib/rpm.te
+++ b/policy/modules/contrib/rpm.te
@@ -350,8 +350,7 @@ logging_send_syslog_msg(rpm_script_t)
miscfiles_read_localization(rpm_script_t)
-modutils_run_depmod(rpm_script_t, rpm_roles)
-modutils_run_insmod(rpm_script_t, rpm_roles)
+modutils_run(rpm_script_t, rpm_roles)
seutil_run_loadpolicy(rpm_script_t, rpm_roles)
seutil_run_setfiles(rpm_script_t, rpm_roles)
diff --git a/policy/modules/contrib/shorewall.te
b/policy/modules/contrib/shorewall.te
index 5e815dd8..3222f01c 100644
--- a/policy/modules/contrib/shorewall.te
+++ b/policy/modules/contrib/shorewall.te
@@ -106,7 +106,7 @@ optional_policy(`
')
optional_policy(`
- modutils_domtrans_insmod(shorewall_t)
+ modutils_domtrans(shorewall_t)
')
optional_policy(`
diff --git a/policy/modules/contrib/updfstab.te
b/policy/modules/contrib/updfstab.te
index 5ceb9124..5aa33bfd 100644
--- a/policy/modules/contrib/updfstab.te
+++ b/policy/modules/contrib/updfstab.te
@@ -99,7 +99,7 @@ optional_policy(`
optional_policy(`
modutils_read_module_config(updfstab_t)
- modutils_exec_insmod(updfstab_t)
+ modutils_exec(updfstab_t)
modutils_read_module_deps(updfstab_t)
')
diff --git a/policy/modules/contrib/usernetctl.te
b/policy/modules/contrib/usernetctl.te
index 3f774951..c5832ef2 100644
--- a/policy/modules/contrib/usernetctl.te
+++ b/policy/modules/contrib/usernetctl.te
@@ -70,7 +70,7 @@ optional_policy(`
')
optional_policy(`
- modutils_run_insmod(usernetctl_t, usernetctl_roles)
+ modutils_run(usernetctl_t, usernetctl_roles)
')
optional_policy(`
diff --git a/policy/modules/contrib/vmware.te b/policy/modules/contrib/vmware.te
index 59a32f5d..7dbcd40e 100644
--- a/policy/modules/contrib/vmware.te
+++ b/policy/modules/contrib/vmware.te
@@ -157,7 +157,7 @@ optional_policy(`
')
optional_policy(`
- modutils_domtrans_insmod(vmware_host_t)
+ modutils_domtrans(vmware_host_t)
')
optional_policy(`
