This patch aims to remove any duplicate delimiter. -- Dominick Grift <domg472@xxxxxxxxx>
Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/evolution.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/evolution.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/evolution.if (working copy) @@ -239,7 +239,7 @@ userdom_manage_user_tmp_dirs($1,$1_evolution_t) userdom_manage_user_tmp_sockets($1,$1_evolution_t) userdom_manage_user_tmp_files($1,$1_evolution_t) - userdom_use_user_terminals($1, $1_evolution_t) + userdom_use_user_terminals($1,$1_evolution_t) # FIXME: suppress access to .local/.icons/.themes until properly implemented # FIXME: suppress access to .gaim/blist.xml (buddy list synchronization) # until properly implemented @@ -399,7 +399,7 @@ ') optional_policy(` - gnome_stream_connect_gconf_template($1, $1_evolution_t) + gnome_stream_connect_gconf_template($1,$1_evolution_t) ') # Encrypt mail @@ -413,8 +413,8 @@ ') optional_policy(` - mozilla_read_user_home_files($1, $1_evolution_t) - mozilla_domtrans_user_mozilla($1, $1_evolution_t) + mozilla_read_user_home_files($1,$1_evolution_t) + mozilla_domtrans_user_mozilla($1,$1_evolution_t) ') # Allow POP/IMAP/SMTP/NNTP/LDAP/IPP(printing) @@ -441,7 +441,7 @@ ifdef(`TODO',` # Gnome common stuff - gnome_application($1_evolution, $1) + gnome_application($1_evolution,$1) #TODO gnome stuff # Store passwords in .gnome2_private @@ -491,7 +491,7 @@ allow $1_evolution_alarm_t $1_evolution_server_t:unix_stream_socket connectto; allow $1_evolution_alarm_t $1_evolution_server_orbit_tmp_t:sock_file write; - domain_auto_trans($2, evolution_alarm_exec_t, $1_evolution_alarm_t) + domain_auto_trans($2,evolution_alarm_exec_t,$1_evolution_alarm_t) allow $1_evolution_alarm_t $2:fd use; dev_read_urand($1_evolution_alarm_t) @@ -529,7 +529,7 @@ ') optional_policy(` - gnome_stream_connect_gconf_template($1, $1_evolution_alarm_t) + gnome_stream_connect_gconf_template($1,$1_evolution_alarm_t) ') optional_policy(` @@ -587,7 +587,7 @@ allow $2 $1_evolution_exchange_orbit_tmp_t:sock_file write; # Transition from user domain - domain_auto_trans($2, evolution_exchange_exec_t, $1_evolution_exchange_t) + domain_auto_trans($2,evolution_exchange_exec_t,$1_evolution_exchange_t) kernel_read_network_state($1_evolution_exchange_t) kernel_read_net_sysctls($1_evolution_exchange_t) @@ -627,7 +627,7 @@ ') optional_policy(` - gnome_stream_connect_gconf_template($1, $1_evolution_exchange_t) + gnome_stream_connect_gconf_template($1,$1_evolution_exchange_t) ') optional_policy(` @@ -636,7 +636,7 @@ ifdef(`TODO',` # Gnome common stuff - gnome_application($1_evolution_exchange, $1) + gnome_application($1_evolution_exchange,$1) ') ######################################## @@ -667,7 +667,7 @@ allow $1_evolution_server_t $1_evolution_alarm_orbit_tmp_t:sock_file write; # Transition from user type - domain_auto_trans($2, evolution_server_exec_t, $1_evolution_server_t) + domain_auto_trans($2,evolution_server_exec_t,$1_evolution_server_t) kernel_read_system_state($1_evolution_server_t) @@ -722,7 +722,7 @@ ') optional_policy(` - gnome_stream_connect_gconf_template($1, $1_evolution_server_t) + gnome_stream_connect_gconf_template($1,$1_evolution_server_t) ') optional_policy(` @@ -731,7 +731,7 @@ ifdef(`TODO',` # Gnome common stuff - gnome_application($1_evolution_server, $1) + gnome_application($1_evolution_server,$1) ') ######################################## @@ -750,7 +750,7 @@ fs_tmpfs_filetrans($1_evolution_webcal_t,$1_evolution_webcal_tmpfs_t,{ dir file lnk_file sock_file fifo_file }) # Transition from user type - domain_auto_trans($2, evolution_webcal_exec_t, $1_evolution_webcal_t) + domain_auto_trans($2,evolution_webcal_exec_t,$1_evolution_webcal_t) corenet_all_recvfrom_unlabeled($1_evolution_webcal_t) corenet_all_recvfrom_netlabel($1_evolution_webcal_t) @@ -857,7 +857,7 @@ # template(`evolution_stream_connect',` gen_require(` - type $1_evolution_t, $1_evolution_home_t; + type $1_evolution_t,$1_evolution_home_t; ') allow $2 $1_evolution_t:unix_stream_socket connectto; Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/userhelper.te =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/userhelper.te (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/userhelper.te (working copy) @@ -1,5 +1,5 @@ -policy_module(userhelper, 1.4.0) +policy_module(userhelper,1.4.0) ######################################## # Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/uml.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/uml.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/uml.if (working copy) @@ -136,8 +136,8 @@ manage_sock_files_pattern($2,$1_uml_tmp_t,$1_uml_tmp_t) # Transition from the user domain to this domain. - domain_auto_trans($2, { uml_exec_t $1_uml_exec_t }, $1_uml_t) - can_exec($1_uml_t, { uml_exec_t $1_uml_exec_t }) + domain_auto_trans($2,{ uml_exec_t $1_uml_exec_t },$1_uml_t) + can_exec($1_uml_t,{ uml_exec_t $1_uml_exec_t }) # for mconsole allow { $2 $1_uml_t } $1_uml_t:unix_dgram_socket sendto; Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/awstats.te =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/awstats.te (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/awstats.te (working copy) @@ -9,7 +9,7 @@ type awstats_t; type awstats_exec_t; domain_type(awstats_t) -domain_entry_file(awstats_t, awstats_exec_t) +domain_entry_file(awstats_t,awstats_exec_t) role system_r types awstats_t; type awstats_tmp_t; @@ -28,12 +28,12 @@ awstats_rw_pipes(awstats_t) awstats_cgi_exec(awstats_t) -manage_dirs_pattern(awstats_t, awstats_tmp_t, awstats_tmp_t) -manage_files_pattern(awstats_t, awstats_tmp_t, awstats_tmp_t) -files_tmp_filetrans(awstats_t, awstats_tmp_t, { dir file }) +manage_dirs_pattern(awstats_t,awstats_tmp_t,awstats_tmp_t) +manage_files_pattern(awstats_t,awstats_tmp_t,awstats_tmp_t) +files_tmp_filetrans(awstats_t,awstats_tmp_t,{ dir file }) -manage_files_pattern(awstats_t, awstats_var_lib_t, awstats_var_lib_t) -files_var_lib_filetrans(awstats_t, awstats_var_lib_t, file) +manage_files_pattern(awstats_t,awstats_var_lib_t,awstats_var_lib_t) +files_var_lib_filetrans(awstats_t,awstats_var_lib_t,file) # dontaudit access to /proc/meminfo kernel_dontaudit_read_system_state(awstats_t) @@ -58,7 +58,7 @@ apache_read_log(awstats_t) optional_policy(` - cron_system_entry(awstats_t, awstats_exec_t) + cron_system_entry(awstats_t,awstats_exec_t) ') optional_policy(` @@ -73,5 +73,5 @@ allow httpd_awstats_script_t awstats_var_lib_t:dir read; -read_files_pattern(httpd_awstats_script_t, awstats_var_lib_t, awstats_var_lib_t) +read_files_pattern(httpd_awstats_script_t,awstats_var_lib_t,awstats_var_lib_t) files_search_var_lib(httpd_awstats_script_t) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/wine.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/wine.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/wine.if (working copy) @@ -12,11 +12,11 @@ # interface(`wine_domtrans',` gen_require(` - type wine_t, wine_exec_t; + type wine_t,wine_exec_t; ') corecmd_search_bin($1) - domtrans_pattern($1, wine_exec_t, wine_t) + domtrans_pattern($1,wine_exec_t,wine_t) ') ######################################## Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/ethereal.te =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/ethereal.te (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/ethereal.te (working copy) @@ -31,7 +31,7 @@ # Store temporary files manage_dirs_pattern(tethereal_t,tethereal_tmp_t,tethereal_tmp_t) manage_files_pattern(tethereal_t,tethereal_tmp_t,tethereal_tmp_t) -files_tmp_filetrans(tethereal_t, tethereal_tmp_t, { dir file }) +files_tmp_filetrans(tethereal_t,tethereal_tmp_t,{ dir file }) # /proc kernel_read_all_sysctls(tethereal_t) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/gnome.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/gnome.if (revision 2761) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/gnome.if (working copy) @@ -34,7 +34,7 @@ # template(`gnome_per_role_template',` gen_require(` - type gconfd_exec_t, gconf_etc_t; + type gconfd_exec_t,gconf_etc_t; attribute gnomedomain; ') @@ -42,16 +42,16 @@ # # Declarations # - type $1_gconfd_t, gnomedomain; + type $1_gconfd_t,gnomedomain; - application_domain($1_gconfd_t, gconfd_exec_t) + application_domain($1_gconfd_t,gconfd_exec_t) role $3 types $1_gconfd_t; type $1_gconf_home_t; - userdom_user_home_content($1, $1_gconf_home_t) + userdom_user_home_content($1,$1_gconf_home_t) type $1_gnome_home_t; - userdom_user_home_content($1, $1_gnome_home_t) + userdom_user_home_content($1,$1_gnome_home_t) type $1_gconf_tmp_t; files_tmp_file($1_gconf_tmp_t) @@ -66,7 +66,7 @@ manage_dirs_pattern($1_gconfd_t,$1_gconf_home_t,$1_gconf_home_t) manage_files_pattern($1_gconfd_t,$1_gconf_home_t,$1_gconf_home_t) - userdom_user_home_dir_filetrans($1, $1_gconfd_t, $1_gconf_home_t, dir) + userdom_user_home_dir_filetrans($1,$1_gconfd_t,$1_gconf_home_t,dir) manage_dirs_pattern($1_gconfd_t,$1_gconf_tmp_t,$1_gconf_tmp_t) manage_files_pattern($1_gconfd_t,$1_gconf_tmp_t,$1_gconf_tmp_t) @@ -162,7 +162,7 @@ # template(`gnome_domtrans_user_gconf',` gen_require(` - type $1_gconfd_t, gconfd_exec_t; + type $1_gconfd_t,gconfd_exec_t; ') domtrans_pattern($2,gconfd_exec_t,$1_gconfd_t) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/qemu.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/qemu.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/qemu.if (working copy) @@ -12,10 +12,10 @@ # interface(`qemu_domtrans',` gen_require(` - type qemu_t, qemu_exec_t; + type qemu_t,qemu_exec_t; ') - domtrans_pattern($1, qemu_exec_t, qemu_t) + domtrans_pattern($1,qemu_exec_t,qemu_t) ') ######################################## @@ -63,7 +63,7 @@ type qemu_t; ') - read_files_pattern($1, qemu_t, qemu_t) + read_files_pattern($1,qemu_t,qemu_t) ') ######################################## @@ -114,10 +114,10 @@ # interface(`qemu_domtrans_unconfined',` gen_require(` - type qemu_unconfined_t, qemu_exec_t; + type qemu_unconfined_t,qemu_exec_t; ') - domtrans_pattern($1, qemu_exec_t, qemu_unconfined_t) + domtrans_pattern($1,qemu_exec_t,qemu_unconfined_t) ') ######################################## @@ -156,9 +156,9 @@ allow $1_t self:unix_stream_socket create_stream_socket_perms; allow $1_t self:tcp_socket create_stream_socket_perms; - manage_dirs_pattern($1_t, $1_tmp_t, $1_tmp_t) - manage_files_pattern($1_t, $1_tmp_t, $1_tmp_t) - files_tmp_filetrans($1_t, $1_tmp_t, { file dir }) + manage_dirs_pattern($1_t,$1_tmp_t,$1_tmp_t) + manage_files_pattern($1_t,$1_tmp_t,$1_tmp_t) + files_tmp_filetrans($1_t,$1_tmp_t,{ file dir }) kernel_read_system_state($1_t) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/podsleuth.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/podsleuth.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/podsleuth.if (working copy) @@ -12,8 +12,8 @@ # interface(`podsleuth_domtrans',` gen_require(` - type podsleuth_t, podsleuth_exec_t; + type podsleuth_t,podsleuth_exec_t; ') - domtrans_pattern($1, podsleuth_exec_t, podsleuth_t) + domtrans_pattern($1,podsleuth_exec_t,podsleuth_t) ') Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/mozilla.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/mozilla.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/mozilla.if (working copy) @@ -34,7 +34,7 @@ # template(`mozilla_per_role_template',` gen_require(` - type mozilla_conf_t, mozilla_exec_t; + type mozilla_conf_t,mozilla_exec_t; ') ######################################## @@ -69,7 +69,7 @@ allow $1_mozilla_t self:netlink_route_socket r_netlink_socket_perms; # for bash - old mozilla binary - can_exec($1_mozilla_t, mozilla_exec_t) + can_exec($1_mozilla_t,mozilla_exec_t) # X access, Home files manage_dirs_pattern($1_mozilla_t,$1_mozilla_home_t,$1_mozilla_home_t) @@ -104,7 +104,7 @@ allow $1_mozilla_t $2:process signull; - domain_auto_trans($2, mozilla_exec_t, $1_mozilla_t) + domain_auto_trans($2,mozilla_exec_t,$1_mozilla_t) # Unrestricted inheritance from the caller. allow $2 $1_mozilla_t:process { noatsecure siginh rlimitinh }; @@ -320,13 +320,13 @@ tunable_policy(`write_untrusted_content',` files_search_home($1_mozilla_t) - userdom_manage_user_untrusted_content_tmp_files($1, $1_mozilla_t) + userdom_manage_user_untrusted_content_tmp_files($1,$1_mozilla_t) files_tmp_filetrans($1_mozilla_t,$1_untrusted_content_tmp_t,file) files_tmp_filetrans($1_mozilla_t,$1_untrusted_content_tmp_t,dir) userdom_manage_user_untrusted_content_files($1,$1_mozilla_t) - userdom_user_home_dir_filetrans($1,$1_mozilla_t,$1_untrusted_content_tmp_t, { file dir }) - userdom_user_home_content_filetrans($1,$1_mozilla_t,$1_untrusted_content_tmp_t, { file dir }) + userdom_user_home_dir_filetrans($1,$1_mozilla_t,$1_untrusted_content_tmp_t,{ file dir }) + userdom_user_home_content_filetrans($1,$1_mozilla_t,$1_untrusted_content_tmp_t,{ file dir }) ',` files_dontaudit_list_home($1_mozilla_t) files_dontaudit_list_tmp($1_mozilla_t) @@ -335,7 +335,6 @@ userdom_dontaudit_manage_user_tmp_dirs($1,$1_mozilla_t) userdom_dontaudit_manage_user_tmp_files($1,$1_mozilla_t) userdom_dontaudit_manage_user_home_content_dirs($1,$1_mozilla_t) - ') optional_policy(` @@ -370,8 +369,8 @@ ') optional_policy(` - mplayer_domtrans_user_mplayer($1, $1_mozilla_t) - mplayer_read_user_home_files($1, $1_mozilla_t) + mplayer_domtrans_user_mplayer($1,$1_mozilla_t) + mplayer_read_user_home_files($1,$1_mozilla_t) ') optional_policy(` @@ -379,7 +378,7 @@ ') optional_policy(` - thunderbird_domtrans_user_thunderbird($1, $1_mozilla_t) + thunderbird_domtrans_user_thunderbird($1,$1_mozilla_t) ') ifdef(`TODO',` @@ -397,8 +396,8 @@ # GNOME integration optional_policy(` - gnome_application($1_mozilla, $1) - gnome_file_dialog($1_mozilla, $1) + gnome_application($1_mozilla,$1) + gnome_file_dialog($1_mozilla,$1) ') ') ') @@ -498,10 +497,10 @@ # template(`mozilla_domtrans_user_mozilla',` gen_require(` - type $1_mozilla_t, mozilla_exec_t; + type $1_mozilla_t,mozilla_exec_t; ') - domtrans_pattern($2, mozilla_exec_t,$1_mozilla_t) + domtrans_pattern($2,mozilla_exec_t,$1_mozilla_t) ') ######################################## Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/mono.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/mono.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/mono.if (working copy) @@ -12,11 +12,11 @@ # interface(`mono_domtrans',` gen_require(` - type mono_t, mono_exec_t; + type mono_t,mono_exec_t; ') corecmd_search_bin($1) - domtrans_pattern($1, mono_exec_t, mono_t) + domtrans_pattern($1,mono_exec_t,mono_t) ') ######################################## @@ -31,9 +31,9 @@ # interface(`mono_exec',` gen_require(` - type mono_t, mono_exec_t; + type mono_t,mono_exec_t; ') corecmd_search_bin($1) - can_exec($1, mono_exec_t) + can_exec($1,mono_exec_t) ') Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/userhelper.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/userhelper.if (revision 2761) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/userhelper.if (working copy) @@ -34,7 +34,7 @@ # template(`userhelper_per_role_template',` gen_require(` - type userhelper_exec_t, userhelper_conf_t; + type userhelper_exec_t,userhelper_conf_t; ') ######################################## @@ -75,7 +75,7 @@ allow $1_userhelper_t userhelper_conf_t:dir rw_dir_perms; rw_files_pattern($1_userhelper_t,userhelper_conf_t,userhelper_conf_t) - can_exec($1_userhelper_t, userhelper_exec_t) + can_exec($1_userhelper_t,userhelper_exec_t) dontaudit $2 $1_userhelper_t:process signal; Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/screen.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/screen.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/screen.if (working copy) @@ -34,7 +34,7 @@ # template(`screen_per_role_template',` gen_require(` - type screen_dir_t, screen_exec_t; + type screen_dir_t,screen_exec_t; ') ######################################## @@ -73,7 +73,7 @@ manage_dirs_pattern($1_screen_t,$1_screen_tmp_t,$1_screen_tmp_t) manage_files_pattern($1_screen_t,$1_screen_tmp_t,$1_screen_tmp_t) manage_fifo_files_pattern($1_screen_t,$1_screen_tmp_t,$1_screen_tmp_t) - files_tmp_filetrans($1_screen_t, $1_screen_tmp_t, { file dir }) + files_tmp_filetrans($1_screen_t,$1_screen_tmp_t,{ file dir }) # Create fifo manage_fifo_files_pattern($1_screen_t,screen_dir_t,$1_screen_var_run_t) @@ -87,7 +87,7 @@ allow $1_screen_t $2:process signal; - domtrans_pattern($2, screen_exec_t, $1_screen_t) + domtrans_pattern($2,screen_exec_t,$1_screen_t) allow $2 $1_screen_t:process signal; allow $1_screen_t $2:process signal; Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/awstats.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/awstats.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/awstats.if (working copy) @@ -33,8 +33,7 @@ # interface(`awstats_cgi_exec',` gen_require(` - type httpd_awstats_script_exec_t; - type httpd_awstats_content_t; + type httpd_awstats_script_exec_t,httpd_awstats_content_t; ') allow $1 httpd_awstats_content_t:dir search_dir_perms; Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/lockdev.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/lockdev.if (revision 2761) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/lockdev.if (working copy) @@ -60,7 +60,7 @@ allow $1_lockdev_t $2:process signull; # Transition from the user domain to the derived domain. - domtrans_pattern($2, lockdev_exec_t, $1_lockdev_t) + domtrans_pattern($2,lockdev_exec_t,$1_lockdev_t) allow $1_lockdev_t $1_lockdev_lock_t:file manage_file_perms; files_lock_filetrans($1_lockdev_t,$1_lockdev_lock_t,file) @@ -74,7 +74,7 @@ logging_send_syslog_msg($1_lockdev_t) - userdom_use_user_terminals($1, $1_lockdev_t) + userdom_use_user_terminals($1,$1_lockdev_t) optional_policy(` logging_send_syslog_msg($1_t) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/gift.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/gift.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/gift.if (working copy) @@ -73,10 +73,10 @@ userdom_user_home_dir_filetrans($1,$1_gift_t,$1_gift_home_t,dir) # Launch gift daemon - domtrans_pattern($1_gift_t, giftd_exec_t, $1_giftd_t) + domtrans_pattern($1_gift_t,giftd_exec_t,$1_giftd_t) # transition from user domain - domtrans_pattern($2, gift_exec_t, $1_gift_t) + domtrans_pattern($2,gift_exec_t,$1_gift_t) # user managed content manage_dirs_pattern($2,$1_gift_home_t,$1_gift_home_t) @@ -148,7 +148,7 @@ manage_lnk_files_pattern($1_giftd_t,$1_gift_home_t,$1_gift_home_t) userdom_user_home_dir_filetrans($1,$1_giftd_t,$1_gift_home_t,dir) - domtrans_pattern($2, giftd_exec_t, $1_giftd_t) + domtrans_pattern($2,giftd_exec_t,$1_giftd_t) kernel_read_system_state($1_giftd_t) kernel_read_kernel_sysctls($1_giftd_t) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/ethereal.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/ethereal.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/ethereal.if (working copy) @@ -86,7 +86,7 @@ # Store temporary files manage_dirs_pattern($1_ethereal_t,$1_ethereal_tmp_t,$1_ethereal_tmp_t) manage_files_pattern($1_ethereal_t,$1_ethereal_tmp_t,$1_ethereal_tmp_t) - files_tmp_filetrans($1_ethereal_t, $1_ethereal_tmp_t, { dir file }) + files_tmp_filetrans($1_ethereal_t,$1_ethereal_tmp_t,{ dir file }) manage_dirs_pattern($1_ethereal_t,$1_ethereal_tmpfs_t,$1_ethereal_tmpfs_t) manage_files_pattern($1_ethereal_t,$1_ethereal_tmpfs_t,$1_ethereal_tmpfs_t) @@ -169,8 +169,8 @@ dontaudit sysadm_ethereal_t snmpd_var_lib_t:file write; ') #TODO - gnome_application($1_ethereal, $1) - gnome_file_dialog($1_ethereal, $1) + gnome_application($1_ethereal,$1) + gnome_file_dialog($1_ethereal,$1) # FIXME: policy is incomplete ') @@ -237,7 +237,7 @@ # template(`ethereal_domtrans_user_ethereal',` gen_require(` - type $1_ethereal_t, ethereal_exec_t; + type $1_ethereal_t,ethereal_exec_t; ') domtrans_pattern($2,ethereal_exec_t,$1_ethereal_t) @@ -255,7 +255,7 @@ # template(`ethereal_domtrans_tethereal',` gen_require(` - type tethereal_t, tethereal_exec_t; + type tethereal_t,tethereal_exec_t; ') domtrans_pattern($1,tethereal_exec_t,tethereal_t) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/webalizer.te =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/webalizer.te (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/webalizer.te (working copy) @@ -52,7 +52,7 @@ manage_dirs_pattern(webalizer_t,webalizer_tmp_t,webalizer_tmp_t) manage_files_pattern(webalizer_t,webalizer_tmp_t,webalizer_tmp_t) -files_tmp_filetrans(webalizer_t, webalizer_tmp_t, { file dir }) +files_tmp_filetrans(webalizer_t,webalizer_tmp_t,{ file dir }) manage_files_pattern(webalizer_t,webalizer_var_lib_t,webalizer_var_lib_t) files_var_lib_filetrans(webalizer_t,webalizer_var_lib_t,file) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/slocate.te =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/slocate.te (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/slocate.te (working copy) @@ -62,5 +62,5 @@ ') optional_policy(` - cron_system_entry(locate_t, locate_exec_t) + cron_system_entry(locate_t,locate_exec_t) ') Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/vmware.te =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/vmware.te (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/vmware.te (working copy) @@ -1,5 +1,5 @@ -policy_module(vmware, 1.6.0) +policy_module(vmware,1.6.0) ######################################## # @@ -45,8 +45,8 @@ manage_sock_files_pattern(vmware_host_t,vmware_var_run_t,vmware_var_run_t) files_pid_filetrans(vmware_host_t,vmware_var_run_t,{ file sock_file }) -manage_files_pattern(vmware_host_t, vmware_log_t, vmware_log_t) -logging_log_filetrans(vmware_host_t, vmware_log_t, { file dir }) +manage_files_pattern(vmware_host_t,vmware_log_t,vmware_log_t) +logging_log_filetrans(vmware_host_t,vmware_log_t,{ file dir }) kernel_read_kernel_sysctls(vmware_host_t) kernel_list_proc(vmware_host_t) @@ -102,7 +102,6 @@ optional_policy(` seutil_sigchld_newrole(vmware_host_t) - ') optional_policy(` Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/rssh.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/rssh.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/rssh.if (working copy) @@ -26,8 +26,7 @@ template(`rssh_per_role_template',` gen_require(` type rssh_exec_t; - attribute rssh_domain_type; - attribute rssh_ro_content_type; + attribute rssh_domain_type,attribute rssh_ro_content_type; ') ############################## @@ -35,7 +34,7 @@ # Declarations # - type $1_rssh_t alias rssh_$1_t, rssh_domain_type; + type $1_rssh_t alias rssh_$1_t,rssh_domain_type; application_domain($1_rssh_t,rssh_exec_t) domain_user_exemption_target($1_t) domain_interactive_fd($1_rssh_t) @@ -44,7 +43,7 @@ type $1_rssh_devpts_t alias rssh_$1_devpts_t; term_user_pty($1_rssh_t,$1_rssh_devpts_t) - type $1_rssh_ro_t alias rssh_$1_ro_t, rssh_ro_content_type; + type $1_rssh_ro_t alias rssh_$1_ro_t,rssh_ro_content_type; userdom_user_home_content($1,$1_rssh_ro_t) type $1_rssh_rw_t alias rssh_$1_rw_t; Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/java.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/java.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/java.if (working copy) @@ -79,10 +79,10 @@ rw_files_pattern($1_javaplugin_t,$1_home_t,$1_home_t) read_files_pattern($1_javaplugin_t,$1_home_t,$1_home_t) - can_exec($1_javaplugin_t, java_exec_t) + can_exec($1_javaplugin_t,java_exec_t) # The user role is authorized for this domain. - domain_auto_trans($1_t, java_exec_t, $1_javaplugin_t) + domain_auto_trans($1_t,java_exec_t,$1_javaplugin_t) allow $1_javaplugin_t $2:fd use; # Unrestricted inheritance from the caller. allow $2 $1_javaplugin_t:process { noatsecure siginh rlimitinh }; @@ -195,7 +195,7 @@ # template(`java_domtrans_user_javaplugin',` gen_require(` - type $1_javaplugin_t, java_exec_t; + type $1_javaplugin_t,java_exec_t; ') domtrans_pattern($2,java_exec_t,$1_javaplugin_t) @@ -213,9 +213,9 @@ # interface(`java_domtrans',` gen_require(` - type java_t, java_exec_t; + type java_t,java_exec_t; ') corecmd_search_bin($1) - domtrans_pattern($1, java_exec_t, java_t) + domtrans_pattern($1,java_exec_t,java_t) ') Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/webalizer.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/webalizer.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/webalizer.if (working copy) @@ -12,7 +12,7 @@ # interface(`webalizer_domtrans',` gen_require(` - type webalizer_t, webalizer_exec_t; + type webalizer_t,webalizer_exec_t; ') domtrans_pattern($1,webalizer_exec_t,webalizer_t) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/ada.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/ada.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/ada.if (working copy) @@ -12,11 +12,11 @@ # interface(`ada_domtrans',` gen_require(` - type ada_t, ada_exec_t; + type ada_t,ada_exec_t; ') corecmd_search_bin($1) - domtrans_pattern($1, ada_exec_t, ada_t) + domtrans_pattern($1,ada_exec_t,ada_t) ') ######################################## Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/gpg.te =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/gpg.te (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/gpg.te (working copy) @@ -1,5 +1,5 @@ -policy_module(gpg, 1.6.0) +policy_module(gpg,1.6.0) ######################################## # Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/usernetctl.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/usernetctl.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/usernetctl.if (working copy) @@ -12,7 +12,7 @@ # interface(`usernetctl_domtrans',` gen_require(` - type usernetctl_t, usernetctl_exec_t; + type usernetctl_t,usernetctl_exec_t; ') domtrans_pattern($1,usernetctl_exec_t,usernetctl_t) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/games.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/games.if (revision 2761) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/games.if (working copy) @@ -35,7 +35,7 @@ template(`games_per_role_template',` gen_require(` - type games_exec_t, games_data_t; + type games_exec_t,games_data_t; ') ######################################## @@ -73,7 +73,7 @@ manage_dirs_pattern($1_games_t,$1_games_tmp_t,$1_games_tmp_t) manage_files_pattern($1_games_t,$1_games_tmp_t,$1_games_tmp_t) - files_tmp_filetrans($1_games_t, $1_games_tmp_t, { file dir }) + files_tmp_filetrans($1_games_t,$1_games_tmp_t,{ file dir }) manage_files_pattern($1_games_t,$1_games_tmpfs_t,$1_games_tmpfs_t) manage_lnk_files_pattern($1_games_t,$1_games_tmpfs_t,$1_games_tmpfs_t) @@ -81,9 +81,9 @@ manage_sock_files_pattern($1_games_t,$1_games_tmpfs_t,$1_games_tmpfs_t) fs_tmpfs_filetrans($1_games_t,$1_games_tmpfs_t,{ file lnk_file sock_file fifo_file }) - can_exec($1_games_t, games_exec_t) + can_exec($1_games_t,games_exec_t) - domain_auto_trans($2, games_exec_t, $1_games_t) + domain_auto_trans($2,games_exec_t,$1_games_t) allow $2 $1_games_t:unix_stream_socket connectto; allow $1_games_t $2:unix_stream_socket connectto; @@ -152,8 +152,8 @@ ') ifdef(`TODO',` - gnome_application($1_games, $1) - gnome_file_dialog($1_games, $1) + gnome_application($1_games,$1) + gnome_file_dialog($1_games,$1) # Access /home/user/.gnome2 # FIXME: Change to use per app types allow $1_games_t $1_gnome_settings_t:dir manage_dir_perms; Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/yam.te =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/yam.te (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/yam.te (working copy) @@ -47,7 +47,7 @@ manage_files_pattern(yam_t,yam_tmp_t,yam_tmp_t) manage_dirs_pattern(yam_t,yam_tmp_t,yam_tmp_t) -files_tmp_filetrans(yam_t, yam_tmp_t, { file dir }) +files_tmp_filetrans(yam_t,yam_tmp_t,{ file dir }) kernel_read_kernel_sysctls(yam_t) kernel_read_proc_symlinks(yam_t) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/vmware.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/vmware.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/vmware.if (working copy) @@ -34,7 +34,7 @@ # template(`vmware_per_role_template',` gen_require(` - type vmware_exec_t, vmware_sys_conf_t; + type vmware_exec_t,vmware_sys_conf_t; ') ############################## @@ -95,7 +95,7 @@ manage_dirs_pattern($1_vmware_t,$1_vmware_tmp_t,$1_vmware_tmp_t) manage_files_pattern($1_vmware_t,$1_vmware_tmp_t,$1_vmware_tmp_t) manage_sock_files_pattern($1_vmware_t,$1_vmware_tmp_t,$1_vmware_tmp_t) - files_tmp_filetrans($1_vmware_t, $1_vmware_tmp_t, { file dir }) + files_tmp_filetrans($1_vmware_t,$1_vmware_tmp_t,{ file dir }) manage_files_pattern($1_vmware_t,$1_vmware_tmpfs_t,$1_vmware_tmpfs_t) manage_lnk_files_pattern($1_vmware_t,$1_vmware_tmpfs_t,$1_vmware_tmpfs_t) @@ -114,7 +114,7 @@ manage_sock_files_pattern($1_vmware_t,$1_vmware_var_run_t,$1_vmware_var_run_t) files_pid_filetrans($1_vmware_t,$1_vmware_var_run_t,{ dir file lnk_file }) - domtrans_pattern($2, vmware_exec_t, $1_vmware_t) + domtrans_pattern($2,vmware_exec_t,$1_vmware_t) kernel_read_system_state($1_vmware_t) kernel_read_network_state($1_vmware_t) @@ -219,5 +219,5 @@ ') logging_search_logs($1) - append_files_pattern($1, vmware_log_t, vmware_log_t) + append_files_pattern($1,vmware_log_t,vmware_log_t) ') Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/mplayer.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/mplayer.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/mplayer.if (working copy) @@ -34,7 +34,7 @@ # template(`mplayer_per_role_template',` gen_require(` - type mencoder_exec_t, mplayer_exec_t, mplayer_etc_t; + type mencoder_exec_t,mplayer_exec_t,mplayer_etc_t; ') ######################################## @@ -72,7 +72,7 @@ read_lnk_files_pattern($1_mencoder_t,mplayer_etc_t,mplayer_etc_t) # domain transition - domtrans_pattern($2, mencoder_exec_t, $1_mencoder_t) + domtrans_pattern($2,mencoder_exec_t,$1_mencoder_t) # Allow the user domain to signal/ps. ps_process_pattern($2,$1_mencoder_t) @@ -200,7 +200,7 @@ ') tunable_policy(`write_untrusted_content',` - userdom_manage_user_untrusted_content_files($1, $1_mplayer_t) + userdom_manage_user_untrusted_content_files($1,$1_mplayer_t) ') # Save encoded files @@ -280,7 +280,7 @@ relabel_lnk_files_pattern($2,$1_mplayer_home_t,$1_mplayer_home_t) # domain transition - domtrans_pattern($2, mplayer_exec_t, $1_mplayer_t) + domtrans_pattern($2,mplayer_exec_t,$1_mplayer_t) # Allow the user domain to signal/ps. ps_process_pattern($2,$1_mplayer_t) @@ -469,10 +469,10 @@ # template(`mplayer_domtrans_user_mplayer',` gen_require(` - type $1_mplayer_t, mplayer_exec_t; + type $1_mplayer_t,mplayer_exec_t; ') - domtrans_pattern($2, mplayer_exec_t,$1_mplayer_t) + domtrans_pattern($2,mplayer_exec_t,$1_mplayer_t) ') ######################################## Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/loadkeys.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/loadkeys.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/loadkeys.if (working copy) @@ -12,11 +12,11 @@ # interface(`loadkeys_domtrans',` gen_require(` - type loadkeys_t, loadkeys_exec_t; + type loadkeys_t,loadkeys_exec_t; ') corecmd_search_bin($1) - domtrans_pattern($1, loadkeys_exec_t, loadkeys_t) + domtrans_pattern($1,loadkeys_exec_t,loadkeys_t) ') ######################################## Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/gpg.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/gpg.if (revision 2761) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/gpg.if (working copy) @@ -36,8 +36,7 @@ # template(`gpg_per_role_template',` gen_require(` - type gpg_exec_t, gpg_helper_exec_t; - type gpg_agent_exec_t, pinentry_exec_t; + type gpg_exec_t,gpg_helper_exec_t,gpg_agent_exec_t,pinentry_exec_t; ') ######################################## @@ -86,7 +85,7 @@ manage_files_pattern($1_gpg_t,$1_gpg_secret_t,$1_gpg_secret_t) manage_lnk_files_pattern($1_gpg_t,$1_gpg_secret_t,$1_gpg_secret_t) allow $1_gpg_t $1_gpg_secret_t:dir create_dir_perms; - userdom_user_home_dir_filetrans($1, $1_gpg_t, $1_gpg_secret_t, dir) + userdom_user_home_dir_filetrans($1,$1_gpg_t,$1_gpg_secret_t,dir) # transition from the userdomain to the derived domain domtrans_pattern($2,gpg_exec_t,$1_gpg_t) @@ -211,7 +210,7 @@ manage_dirs_pattern($1_gpg_agent_t,$1_gpg_agent_tmp_t,$1_gpg_agent_tmp_t) manage_files_pattern($1_gpg_agent_t,$1_gpg_agent_tmp_t,$1_gpg_agent_tmp_t) manage_sock_files_pattern($1_gpg_agent_t,$1_gpg_agent_tmp_t,$1_gpg_agent_tmp_t) - files_tmp_filetrans($1_gpg_agent_t, $1_gpg_agent_tmp_t, { file sock_file dir }) + files_tmp_filetrans($1_gpg_agent_t,$1_gpg_agent_tmp_t,{ file sock_file dir }) # read and write ~/.gnupg (gpg-agent stores secret keys in ~/.gnupg/private-keys-v1.d ) manage_dirs_pattern($1_gpg_agent_t,$1_gpg_secret_t,$1_gpg_secret_t) @@ -233,7 +232,7 @@ manage_sock_files_pattern($2,$1_gpg_agent_tmp_t,$1_gpg_agent_tmp_t) # Transition from the user domain to the derived domain. - domtrans_pattern($2, gpg_agent_exec_t, $1_gpg_agent_t) + domtrans_pattern($2,gpg_agent_exec_t,$1_gpg_agent_t) corecmd_search_bin($1_gpg_agent_t) @@ -358,10 +357,10 @@ # template(`gpg_domtrans_user_gpg',` gen_require(` - type $1_gpg_t, gpg_exec_t; + type $1_gpg_t,gpg_exec_t; ') - domtrans_pattern($2, gpg_exec_t, $1_gpg_t) + domtrans_pattern($2,gpg_exec_t,$1_gpg_t) ') ######################################## Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/yam.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/yam.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/yam.if (working copy) @@ -12,7 +12,7 @@ # interface(`yam_domtrans',` gen_require(` - type yam_t, yam_exec_t; + type yam_t,yam_exec_t; ') corecmd_search_bin($1) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/authbind.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/authbind.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/authbind.if (working copy) @@ -12,7 +12,7 @@ # interface(`authbind_domtrans',` gen_require(` - type authbind_t, authbind_exec_t; + type authbind_t,authbind_exec_t; ') domtrans_pattern($1,authbind_exec_t,authbind_t) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/wireshark.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/wireshark.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/wireshark.if (working copy) @@ -86,7 +86,7 @@ # Store temporary files manage_dirs_pattern($1_wireshark_t,$1_wireshark_tmp_t,$1_wireshark_tmp_t) manage_files_pattern($1_wireshark_t,$1_wireshark_tmp_t,$1_wireshark_tmp_t) - files_tmp_filetrans($1_wireshark_t, $1_wireshark_tmp_t, { dir file }) + files_tmp_filetrans($1_wireshark_t,$1_wireshark_tmp_t,{ dir file }) manage_dirs_pattern($1_wireshark_t,$1_wireshark_tmpfs_t,$1_wireshark_tmpfs_t) manage_files_pattern($1_wireshark_t,$1_wireshark_tmpfs_t,$1_wireshark_tmpfs_t) @@ -237,7 +237,7 @@ # template(`wireshark_domtrans_user_wireshark',` gen_require(` - type $1_wireshark_t, wireshark_exec_t; + type $1_wireshark_t,wireshark_exec_t; ') domtrans_pattern($2,wireshark_exec_t,$1_wireshark_t) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/uml.te =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/uml.te (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/uml.te (working copy) @@ -1,5 +1,5 @@ -policy_module(uml, 1.6.0) +policy_module(uml,1.6.0) ######################################## # Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/thunderbird.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/thunderbird.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/thunderbird.if (working copy) @@ -45,7 +45,7 @@ type $1_thunderbird_home_t alias $1_thunderbird_rw_t; files_poly_member($1_thunderbird_home_t) - userdom_user_home_content($1, $1_thunderbird_home_t) + userdom_user_home_content($1,$1_thunderbird_home_t) type $1_thunderbird_tmpfs_t; files_tmpfs_file($1_thunderbird_tmpfs_t) @@ -321,7 +321,7 @@ optional_policy(` gnome_stream_connect_gconf_template($1,$1_thunderbird_t) gnome_domtrans_user_gconf($1, $1_thunderbird_t) - gnome_manage_user_gnome_config($1, $1_thunderbird_t) + gnome_manage_user_gnome_config($1,$1_thunderbird_t) ') optional_policy(` @@ -333,8 +333,8 @@ ') optional_policy(` - mozilla_read_user_home_files($1, $1_thunderbird_t) - mozilla_domtrans_user_mozilla($1, $1_thunderbird_t) + mozilla_read_user_home_files($1,$1_thunderbird_t) + mozilla_domtrans_user_mozilla($1,$1_thunderbird_t) mozilla_dbus_chat($1, $1_thunderbird_t) ') @@ -345,8 +345,8 @@ # GNOME support optional_policy(` - gnome_application($1_thunderbird, $1) - gnome_file_dialog($1_thunderbird, $1) + gnome_application($1_thunderbird,$1) + gnome_file_dialog($1_thunderbird,$1) allow $1_thunderbird_t $1_gnome_settings_t:file { read write }; ') ') @@ -379,8 +379,8 @@ # template(`thunderbird_domtrans_user_thunderbird',` gen_require(` - type $1_thunderbird_t, thunderbird_exec_t; + type $1_thunderbird_t,thunderbird_exec_t; ') - domtrans_pattern($2, thunderbird_exec_t,$1_thunderbird_t) + domtrans_pattern($2,thunderbird_exec_t,$1_thunderbird_t) ') Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/qemu.te =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/qemu.te (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/qemu.te (working copy) @@ -1,5 +1,5 @@ -policy_module(qemu, 1.0.0) +policy_module(qemu,1.0.0) ######################################## # @@ -11,11 +11,11 @@ ## Allow qemu to connect fully to the network ## </p> ## </desc> -gen_tunable(qemu_full_network, false) +gen_tunable(qemu_full_network,false) type qemu_exec_t; qemu_domain_template(qemu) -application_domain(qemu_t, qemu_exec_t) +application_domain(qemu_t,qemu_exec_t) role system_r types qemu_t; ######################################## Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/podsleuth.te =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/podsleuth.te (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/apps/podsleuth.te (working copy) @@ -1,5 +1,5 @@ -policy_module(podsleuth, 1.0.0) +policy_module(podsleuth,1.0.0) ######################################## # @@ -8,7 +8,7 @@ type podsleuth_t; type podsleuth_exec_t; -application_domain(podsleuth_t, podsleuth_exec_t) +application_domain(podsleuth_t,podsleuth_exec_t) role system_r types podsleuth_t; ######################################## @@ -31,7 +31,7 @@ miscfiles_read_localization(podsleuth_t) -dbus_system_bus_client_template(podsleuth, podsleuth_t) +dbus_system_bus_client_template(podsleuth,podsleuth_t) mono_exec(podsleuth_t)
Attachment:
signature.asc
Description: This is a digitally signed message part