From 28fdb87aed4d96ba641e5b8af1d3b7088709bce2 Mon Sep 17 00:00:00 2001 From: Dominick Grift Date: Fri, 17 Sep 2010 09:25:55 +0200 Subject: [PATCH] Move system type alias statements to system declarations. Squash me with 81a5e7c5394ee93d99df472199737cd61f3c24eb Without this build fails because at the point httpd_var_run_t is not yet declared. --- policy/modules/services/apache.te | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/policy/modules/services/apache.te b/policy/modules/services/apache.te index c40c2ab1..a6f4e2a5 100644 --- a/policy/modules/services/apache.te +++ b/policy/modules/services/apache.te @@ -286,6 +286,13 @@ typeattribute httpd_sys_content_t httpdcontent; # customizable typeattribute httpd_sys_rw_content_t httpdcontent; # customizable typeattribute httpd_sys_ra_content_t httpdcontent; # customizable +# Removal of fastcgi, will cause problems without the following +typealias httpd_sys_script_exec_t alias httpd_fastcgi_script_exec_t; +typealias httpd_sys_content_t alias { httpd_fastcgi_content_t httpd_fastcgi_script_ro_t }; +typealias httpd_sys_rw_content_t alias { httpd_fastcgi_rw_content_t httpd_fastcgi_script_rw_t }; +typealias httpd_sys_ra_content_t alias httpd_fastcgi_script_ra_t; +typealias httpd_sys_script_t alias httpd_fastcgi_script_t; + type httpd_tmp_t; files_tmp_file(httpd_tmp_t) @@ -327,6 +334,9 @@ files_type(httpd_var_lib_t) type httpd_var_run_t; files_pid_file(httpd_var_run_t) +# Removal of fastcgi, will cause problems without the following +typealias httpd_var_run_t alias httpd_fastcgi_var_run_t; + # File Type of squirrelmail attachments type squirrelmail_spool_t; files_tmp_file(squirrelmail_spool_t) @@ -1177,11 +1187,3 @@ tunable_policy(`httpd_read_user_content',` userdom_read_user_home_content_files(httpd_user_script_t) userdom_read_user_home_content_files(httpd_suexec_t) ') - -# Removal of fastcgi, will cause problems without the following -typealias httpd_sys_script_exec_t alias httpd_fastcgi_script_exec_t; -typealias httpd_sys_content_t alias { httpd_fastcgi_content_t httpd_fastcgi_script_ro_t }; -typealias httpd_sys_rw_content_t alias { httpd_fastcgi_rw_content_t httpd_fastcgi_script_rw_t }; -typealias httpd_sys_ra_content_t alias httpd_fastcgi_script_ra_t; -typealias httpd_sys_script_t alias httpd_fastcgi_script_t; -typealias httpd_var_run_t alias httpd_fastcgi_var_run_t;