[selinux-policy: 963/3172] fix type transition conflicts

[Daniel J Walsh]

commit 3be48fa4e141c91b1a8c8c1ad9ea3c16413cc151
Author: Chris PeBenito <cpebenito at tresys.com>
Date:   Fri Nov 11 21:33:54 2005 +0000

    fix type transition conflicts

 refpolicy/policy/modules/admin/rpm.te |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/refpolicy/policy/modules/admin/rpm.te b/refpolicy/policy/modules/admin/rpm.te
index 4ccf1bd..e2aa635 100644
--- a/refpolicy/policy/modules/admin/rpm.te
+++ b/refpolicy/policy/modules/admin/rpm.te
@@ -82,9 +82,6 @@ allow rpm_t self:msg { send receive };
 allow rpm_t self:dir search;
 allow rpm_t self:file rw_file_perms;;
 
-allow rpm_t rpm_log_t:file create_file_perms;
-logging_create_log(rpm_t,rpm_log_t)
-
 allow rpm_t rpm_tmp_t:dir create_dir_perms;
 allow rpm_t rpm_tmp_t:file create_file_perms;
 files_create_tmp_files(rpm_t, rpm_tmp_t, { file dir })
@@ -176,6 +173,12 @@ userdom_use_unpriv_users_fd(rpm_t)
 
 ifdef(`targeted_policy',`
 	unconfined_domain_template(rpm_t)
+',`
+	# cjp: these are here to stop type_transition
+	# conflicts since rpm_t is an alias of
+	# unconfined in the targeted policy
+	allow rpm_t rpm_log_t:file create_file_perms;
+	logging_create_log(rpm_t,rpm_log_t)
 ')
 
 optional_policy(`cron.te',`