Puppet fixes

diff --git a/policy/modules/roles/xguest.te b/policy/modules/roles/xguest.te
index 6b62d9862b6f9a8e28eeeb5185d11e9b9ab65ddb..b1ea76e577ffac680a0848038e0d48c3d54defe7 100644 (file)
--- a/policy/modules/roles/xguest.te
+++ b/policy/modules/roles/xguest.te
@@ -105,10 +105,6 @@ optional_policy(`
        gnomeclock_dontaudit_dbus_chat(xguest_t)
 ')
 
-optional_policy(`
-       java_role_template(xguest, xguest_r, xguest_t)
-')
-
 optional_policy(`
        mono_role_template(xguest, xguest_r, xguest_t)
 ')

diff --git a/policy/modules/services/puppet.te b/policy/modules/services/puppet.te
index 3bf95675a6e530c3a681de890aec730277da715a..fb500deb694c2a6a71dcaf9992bf1c7a94e81bb7 100644 (file)
--- a/policy/modules/services/puppet.te
+++ b/policy/modules/services/puppet.te
@@ -242,8 +242,9 @@ optional_policy(`
 ')
 
 optional_policy(`
-       usermanage_access_check_passwd(puppetca_t)
-       usermanage_access_check_useradd(puppetca_t)
+    usermanage_access_check_groupadd(puppet_t)
+    usermanage_access_check_passwd(puppet_t)
+    usermanage_access_check_useradd(puppet_t)
 ')
 
 ########################################

diff --git a/policy/modules/services/vhostmd.te b/policy/modules/services/vhostmd.te
index 754f2bab69dbe3f9600faf97cdea764b3e9b0858..e3d91ad10cf39554183330b7f1cbb1d6d34c92ed 100644 (file)
--- a/policy/modules/services/vhostmd.te
+++ b/policy/modules/services/vhostmd.te
@@ -52,7 +52,7 @@ files_list_tmp(vhostmd_t)
 files_read_etc_files(vhostmd_t)
 files_read_usr_files(vhostmd_t)
 
-dev_read_random(vhostmd_t)
+dev_read_rand(vhostmd_t)
 dev_read_sysfs(vhostmd_t)
 
 auth_use_nsswitch(vhostmd_t)

diff --git a/policy/modules/system/userdomain.if b/policy/modules/system/userdomain.if
index f5cb8b5385bf1f379f9be2d4c914b60ed372ae6c..31047e820ec21b755af3de43dce2957cc64afa78 100644 (file)
--- a/policy/modules/system/userdomain.if
+++ b/policy/modules/system/userdomain.if
@@ -1281,14 +1281,6 @@ template(`userdom_unpriv_user_template', `
                gpm_stream_connect($1_usertype)
        ')
 
-       optional_policy(`
-               execmem_role_template($1, $1_r, $1_t)
-       ')
-
-       optional_policy(`
-               java_role_template($1, $1_r, $1_t)
-       ')
-
        optional_policy(`
                mono_role_template($1, $1_r, $1_t)
        ')