fix type transition conflicts

This commit is contained in:
Chris PeBenito 2005-11-11 21:33:54 +00:00
parent 17da253e65
commit 3be48fa4e1
1 changed files with 6 additions and 3 deletions

View File

@ -82,9 +82,6 @@ allow rpm_t self:msg { send receive };
allow rpm_t self:dir search; allow rpm_t self:dir search;
allow rpm_t self:file rw_file_perms;; 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:dir create_dir_perms;
allow rpm_t rpm_tmp_t:file create_file_perms; allow rpm_t rpm_tmp_t:file create_file_perms;
files_create_tmp_files(rpm_t, rpm_tmp_t, { file dir }) 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',` ifdef(`targeted_policy',`
unconfined_domain_template(rpm_t) 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',` optional_policy(`cron.te',`