From 2d102f8402c6b2a3e3f765280aa289a58539659c Mon Sep 17 00:00:00 2001 From: Dominick Grift Date: Sep 16 2010 10:18:31 +0000 Subject: Whitespace, newline and tab fixes. Whitespace, newline and tab fixes. Whitespace, newline and tab fixes. Whitespace, newline and tab fixes. Whitespace, newline and tab fixes. Whitespace, newline and tab fixes. Whitespace, newline and tab fixes. Whitespace, newline and tab fixes. Whitespace, newline and tab fixes. Whitespace, newline and tab fixes. Whitespace, newline and tab fixes. Whitespace, newline and tab fixes. Signed-off-by: Dominick Grift --- diff --git a/policy/modules/services/virt.if b/policy/modules/services/virt.if index 1a0701b..1bf0602 100644 --- a/policy/modules/services/virt.if +++ b/policy/modules/services/virt.if @@ -609,4 +609,3 @@ interface(`virt_dontaudit_write_pipes',` dontaudit $1 virtd_t:fifo_file write_fifo_file_perms; ') - diff --git a/policy/modules/services/xfs.if b/policy/modules/services/xfs.if index aa6e5a8..42a0efb 100644 --- a/policy/modules/services/xfs.if +++ b/policy/modules/services/xfs.if @@ -1,4 +1,4 @@ -## X Windows Font Server +## X Windows Font Server ######################################## ## diff --git a/policy/modules/services/xserver.if b/policy/modules/services/xserver.if index fa4c4b5..8ed36f2 100644 --- a/policy/modules/services/xserver.if +++ b/policy/modules/services/xserver.if @@ -114,7 +114,7 @@ interface(`xserver_restricted_role',` # Needed for escd, remove if we get escd policy xserver_manage_xdm_tmp_files($2) - ifdef(`hide_broken_symptoms', ` + ifdef(`hide_broken_symptoms',` dontaudit iceauth_t $2:socket_class_set { read write }; ') @@ -179,7 +179,6 @@ interface(`xserver_role',` manage_files_pattern($2, user_fonts_config_t, user_fonts_config_t) relabel_dirs_pattern($2, user_fonts_config_t, user_fonts_config_t) relabel_files_pattern($2, user_fonts_config_t, user_fonts_config_t) - ') ####################################### @@ -504,7 +503,7 @@ template(`xserver_user_x_domain_template',` # for .xsession-errors userdom_dontaudit_write_user_home_content_files($2) - xserver_ro_session($2,$3) + xserver_ro_session($2, $3) xserver_use_user_fonts($2) xserver_read_xdm_tmp_files($2) @@ -512,7 +511,7 @@ template(`xserver_user_x_domain_template',` # X object manager xserver_object_types_template($1) - xserver_common_x_domain_template($1,$2) + xserver_common_x_domain_template($1, $2) # Client write xserver shm tunable_policy(`allow_write_xshm',` @@ -584,7 +583,7 @@ interface(`xserver_domtrans_xauth',` domtrans_pattern($1, xauth_exec_t, xauth_t) - ifdef(`hide_broken_symptoms', ` + ifdef(`hide_broken_symptoms',` dontaudit xauth_t $1:socket_class_set { read write }; ') ') @@ -712,7 +711,7 @@ interface(`xserver_use_xdm_fds',` type xdm_t; ') - allow $1 xdm_t:fd use; + allow $1 xdm_t:fd use; ') ######################################## @@ -731,7 +730,7 @@ interface(`xserver_dontaudit_use_xdm_fds',` type xdm_t; ') - dontaudit $1 xdm_t:fd use; + dontaudit $1 xdm_t:fd use; ') ######################################## @@ -749,7 +748,7 @@ interface(`xserver_rw_xdm_pipes',` type xdm_t; ') - allow $1 xdm_t:fifo_file { getattr read write }; + allow $1 xdm_t:fifo_file { getattr read write }; ') ######################################## @@ -764,12 +763,11 @@ interface(`xserver_rw_xdm_pipes',` ## # interface(`xserver_dontaudit_rw_xdm_pipes',` - gen_require(` type xdm_t; ') - dontaudit $1 xdm_t:fifo_file rw_fifo_file_perms; + dontaudit $1 xdm_t:fifo_file rw_fifo_file_perms; ') ######################################## @@ -1039,7 +1037,7 @@ interface(`xserver_read_xdm_etc_files',` type xdm_etc_t; ') - files_search_etc($1) + files_search_etc($1) read_files_pattern($1, xdm_etc_t, xdm_etc_t) ') @@ -1058,7 +1056,7 @@ interface(`xserver_manage_xdm_etc_files',` type xdm_etc_t; ') - files_search_etc($1) + files_search_etc($1) manage_files_pattern($1, xdm_etc_t, xdm_etc_t) ') @@ -1077,7 +1075,7 @@ interface(`xserver_read_xdm_tmp_files',` type xdm_tmp_t; ') - files_search_tmp($1) + files_search_tmp($1) read_files_pattern($1, xdm_tmp_t, xdm_tmp_t) ') @@ -1171,7 +1169,7 @@ interface(`xserver_domtrans',` type xserver_t, xserver_exec_t; ') - allow $1 xserver_t:process siginh; + allow $1 xserver_t:process siginh; domtrans_pattern($1, xserver_exec_t, xserver_t) allow xserver_t $1:process getpgid; @@ -1314,7 +1312,7 @@ interface(`xserver_read_tmp_files',` ## ## Interface to provide X object permissions on a given X server to ## an X client domain. Gives the domain permission to read the -## virtual core keyboard and virtual core pointer devices. +## virtual core keyboard and virtual core pointer devices. ## ## ## @@ -1600,7 +1598,6 @@ interface(`xserver_search_xdm_lib',` allow $1 xdm_var_lib_t:dir search_dir_perms; ') - ######################################## ## ## Make an X executable an entrypoint for the specified domain. diff --git a/policy/modules/services/zabbix.if b/policy/modules/services/zabbix.if index d77e631..4776863 100644 --- a/policy/modules/services/zabbix.if +++ b/policy/modules/services/zabbix.if @@ -5,9 +5,9 @@ ## Execute a domain transition to run zabbix. ## ## -## +## ## Domain allowed to transition. -## +## ## # interface(`zabbix_domtrans',` @@ -44,9 +44,9 @@ interface(`zabbix_read_log',` ## zabbix log files. ## ## -## +## ## Domain allowed access. -## +## ## # interface(`zabbix_append_log',` diff --git a/policy/modules/services/zarafa.if b/policy/modules/services/zarafa.if index bba3124..77367ec 100644 --- a/policy/modules/services/zarafa.if +++ b/policy/modules/services/zarafa.if @@ -1,15 +1,14 @@ - ## policy for zarafa services ###################################### ## -## Creates types and rules for a basic -## zararfa init daemon domain. +## Creates types and rules for a basic +## zararfa init daemon domain. ## ## -## -## Prefix for the domain. -## +## +## Prefix for the domain. +## ## # template(`zarafa_domain_template',` @@ -19,12 +18,12 @@ template(`zarafa_domain_template',` ') ############################## - # - # $1_t declarations - # + # + # $1_t declarations + # type zarafa_$1_t, zarafa_domain; - type zarafa_$1_exec_t; + type zarafa_$1_exec_t; init_daemon_domain(zarafa_$1_t, zarafa_$1_exec_t) type zarafa_$1_log_t; @@ -34,28 +33,28 @@ template(`zarafa_domain_template',` files_pid_file(zarafa_$1_var_run_t) ############################## - # + # # $1_t local policy - # + # manage_files_pattern(zarafa_$1_t, zarafa_$1_var_run_t, zarafa_$1_var_run_t) - manage_sock_files_pattern(zarafa_$1_t, zarafa_$1_var_run_t, zarafa_$1_var_run_t) - files_pid_filetrans(zarafa_$1_t, zarafa_$1_var_run_t, { file sock_file }) + manage_sock_files_pattern(zarafa_$1_t, zarafa_$1_var_run_t, zarafa_$1_var_run_t) + files_pid_filetrans(zarafa_$1_t, zarafa_$1_var_run_t, { file sock_file }) #stream_connect_pattern(zarafa_$1_t, $1_var_run_t, $1_var_run_t, virtd_t) manage_files_pattern(zarafa_$1_t, zarafa_$1_log_t,zarafa_$1_log_t) #manage_sock_files_pattern(zarafa_$1_t, zarafa_$1_log_t,zarafa_$1_log_t) logging_log_filetrans(zarafa_$1_t,zarafa_$1_log_t,{ file }) -') - +') + ######################################## ## ## Execute a domain transition to run zarafa_server. ## ## -## +## ## Domain allowed to transition. -## +## ## # interface(`zarafa_server_domtrans',` @@ -66,15 +65,14 @@ interface(`zarafa_server_domtrans',` domtrans_pattern($1, zarafa_server_exec_t, zarafa_server_t) ') - ######################################## ## ## Execute a domain transition to run zarafa_deliver. ## ## -## +## ## Domain allowed to transition. -## +## ## # interface(`zarafa_deliver_domtrans',` @@ -87,19 +85,19 @@ interface(`zarafa_deliver_domtrans',` ####################################### ## -## Connect to zarafa-server unix domain stream socket. +## Connect to zarafa-server unix domain stream socket. ## ## -## -## Domain allowed access. -## +## +## Domain allowed access. +## ## ## # interface(`zarafa_stream_connect_server',` - gen_require(` - type zarafa_server_t, zarafa_server_var_run_t; - ') + gen_require(` + type zarafa_server_t, zarafa_server_var_run_t; + ') - stream_connect_pattern($1, zarafa_server_t, zarafa_server_var_run_t, zarafa_server_t) + stream_connect_pattern($1, zarafa_server_t, zarafa_server_var_run_t, zarafa_server_t) ') diff --git a/policy/modules/services/zosremote.if b/policy/modules/services/zosremote.if index 702e768..1d24e1e 100644 --- a/policy/modules/services/zosremote.if +++ b/policy/modules/services/zosremote.if @@ -5,9 +5,9 @@ ## Execute a domain transition to run audispd-zos-remote. ## ## -## +## ## Domain allowed to transition. -## +## ## # interface(`zosremote_domtrans',`