This patch aims to remove any duplicate delimiter. -- Dominick Grift <domg472@xxxxxxxxx>
Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/usbmodules.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/usbmodules.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/usbmodules.if (working copy) @@ -12,10 +12,10 @@ # interface(`usbmodules_domtrans',` gen_require(` - type usbmodules_t, usbmodules_exec_t; + type usbmodules_t,usbmodules_exec_t; ') - domtrans_pattern($1, usbmodules_exec_t, usbmodules_t) + domtrans_pattern($1,usbmodules_exec_t,usbmodules_t) ') ######################################## Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/apt.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/apt.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/apt.if (working copy) @@ -12,7 +12,7 @@ # interface(`apt_domtrans',` gen_require(` - type apt_t, apt_exec_t; + type apt_t,apt_exec_t; ') files_search_usr($1) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/firstboot.te =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/firstboot.te (revision 2761) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/firstboot.te (working copy) @@ -63,7 +63,7 @@ files_exec_etc_files(firstboot_t) files_manage_etc_files(firstboot_t) files_manage_etc_runtime_files(firstboot_t) -files_etc_filetrans_etc_runtime(firstboot_t, { file dir }) +files_etc_filetrans_etc_runtime(firstboot_t,{ file dir }) files_read_usr_files(firstboot_t) files_manage_var_dirs(firstboot_t) files_manage_var_files(firstboot_t) @@ -94,7 +94,7 @@ unprivuser_manage_home_content_pipes(firstboot_t) unprivuser_manage_home_content_sockets(firstboot_t) unprivuser_home_filetrans_home_dir(firstboot_t) -unprivuser_home_dir_filetrans_home_content(firstboot_t, { dir file lnk_file fifo_file sock_file }) +unprivuser_home_dir_filetrans_home_content(firstboot_t,{ dir file lnk_file fifo_file sock_file }) optional_policy(` hal_dbus_chat(firstboot_t) @@ -124,15 +124,15 @@ allow firstboot_t proc_t:file write; ifdef(`printconf.te', ` - can_exec(firstboot_t, printconf_t) + can_exec(firstboot_t,printconf_t) ') ifdef(`userhelper.te', ` role system_r types sysadm_userhelper_t; - domain_auto_trans(firstboot_t, userhelper_exec_t, sysadm_userhelper_t) + domain_auto_trans(firstboot_t,userhelper_exec_t,sysadm_userhelper_t) ') ifdef(`xserver.te', ` - domain_auto_trans(firstboot_t, xserver_exec_t, xdm_xserver_t) + domain_auto_trans(firstboot_t,xserver_exec_t,xdm_xserver_t) ') ') dnl end TODO Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/rpm.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/rpm.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/rpm.if (working copy) @@ -12,7 +12,7 @@ # interface(`rpm_domtrans',` gen_require(` - type rpm_t, rpm_exec_t; + type rpm_t,rpm_exec_t; ') files_search_usr($1) @@ -65,7 +65,7 @@ # interface(`rpm_run',` gen_require(` - type rpm_t, rpm_script_t; + type rpm_t,rpm_script_t; ') rpm_domtrans($1) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/kudzu.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/kudzu.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/kudzu.if (working copy) @@ -12,7 +12,7 @@ # interface(`kudzu_domtrans',` gen_require(` - type kudzu_t, kudzu_exec_t; + type kudzu_t,kudzu_exec_t; ') domtrans_pattern($1,kudzu_exec_t,kudzu_t) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/quota.te =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/quota.te (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/quota.te (working copy) @@ -27,14 +27,14 @@ # for /quota.* allow quota_t quota_db_t:file { manage_file_perms quotaon }; -files_root_filetrans(quota_t, quota_db_t, file) -files_boot_filetrans(quota_t, quota_db_t, file) -files_etc_filetrans(quota_t, quota_db_t, file) -files_tmp_filetrans(quota_t, quota_db_t, file) -files_home_filetrans(quota_t, quota_db_t, file) -files_usr_filetrans(quota_t, quota_db_t, file) -files_var_filetrans(quota_t, quota_db_t, file) -files_spool_filetrans(quota_t, quota_db_t, file) +files_root_filetrans(quota_t,quota_db_t,file) +files_boot_filetrans(quota_t,quota_db_t,file) +files_etc_filetrans(quota_t,quota_db_t,file) +files_tmp_filetrans(quota_t,quota_db_t,file) +files_home_filetrans(quota_t,quota_db_t,file) +files_usr_filetrans(quota_t,quota_db_t,file) +files_var_filetrans(quota_t,quota_db_t,file) +files_spool_filetrans(quota_t,quota_db_t,file) kernel_list_proc(quota_t) kernel_read_proc_symlinks(quota_t) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/backup.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/backup.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/backup.if (working copy) @@ -12,7 +12,7 @@ # interface(`backup_domtrans',` gen_require(` - type backup_t, backup_exec_t; + type backup_t,backup_exec_t; ') domtrans_pattern($1,backup_exec_t,backup_t) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/tripwire.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/tripwire.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/tripwire.if (working copy) @@ -25,7 +25,7 @@ # interface(`tripwire_domtrans_tripwire',` gen_require(` - type tripwire_t, tripwire_exec_t; + type tripwire_t,tripwire_exec_t; ') domtrans_pattern($1,tripwire_exec_t,tripwire_t) @@ -75,7 +75,7 @@ # interface(`tripwire_domtrans_twadmin',` gen_require(` - type twadmin_t, twadmin_exec_t; + type twadmin_t,twadmin_exec_t; ') domtrans_pattern($1,twadmin_exec_t,twadmin_t) @@ -125,7 +125,7 @@ # interface(`tripwire_domtrans_twprint',` gen_require(` - type twprint_t, twprint_exec_t; + type twprint_t,twprint_exec_t; ') domtrans_pattern($1,twprint_exec_t,twprint_t) @@ -175,7 +175,7 @@ # interface(`tripwire_domtrans_siggen',` gen_require(` - type siggen_t, siggen_exec_t; + type siggen_t,siggen_exec_t; ') domtrans_pattern($1,siggen_exec_t,siggen_t) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/amtu.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/amtu.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/amtu.if (working copy) @@ -12,7 +12,7 @@ # interface(`amtu_domtrans',` gen_require(` - type amtu_t, amtu_exec_t; + type amtu_t,amtu_exec_t; ') corecmd_search_bin($1) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/logrotate.te =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/logrotate.te (revision 2761) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/logrotate.te (working copy) @@ -57,12 +57,12 @@ manage_dirs_pattern(logrotate_t,logrotate_tmp_t,logrotate_tmp_t) manage_files_pattern(logrotate_t,logrotate_tmp_t,logrotate_tmp_t) -files_tmp_filetrans(logrotate_t, logrotate_tmp_t, { file dir }) +files_tmp_filetrans(logrotate_t,logrotate_tmp_t,{ file dir }) # for /var/lib/logrotate.status and /var/lib/logcheck create_dirs_pattern(logrotate_t,logrotate_var_lib_t,logrotate_var_lib_t) manage_files_pattern(logrotate_t,logrotate_var_lib_t,logrotate_var_lib_t) -files_var_lib_filetrans(logrotate_t, logrotate_var_lib_t, file) +files_var_lib_filetrans(logrotate_t,logrotate_var_lib_t,file) kernel_read_system_state(logrotate_t) kernel_read_kernel_sysctls(logrotate_t) @@ -117,7 +117,7 @@ userdom_use_unpriv_users_fds(logrotate_t) -cron_system_entry(logrotate_t, logrotate_exec_t) +cron_system_entry(logrotate_t,logrotate_exec_t) cron_search_spool(logrotate_t) mta_send_mail(logrotate_t) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/vbetool.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/vbetool.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/vbetool.if (working copy) @@ -12,7 +12,7 @@ # interface(`vbetool_domtrans',` gen_require(` - type vbetool_t, vbetool_exec_t; + type vbetool_t,vbetool_exec_t; ') corecmd_search_bin($1) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/firstboot.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/firstboot.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/firstboot.if (working copy) @@ -15,7 +15,7 @@ # interface(`firstboot_domtrans',` gen_require(` - type firstboot_t, firstboot_exec_t; + type firstboot_t,firstboot_exec_t; ') domtrans_pattern($1,firstboot_exec_t,firstboot_t) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/prelink.te =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/prelink.te (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/prelink.te (working copy) @@ -31,18 +31,18 @@ allow prelink_t self:fifo_file rw_fifo_file_perms; allow prelink_t prelink_cache_t:file manage_file_perms; -files_etc_filetrans(prelink_t, prelink_cache_t, file) -files_var_lib_filetrans(prelink_t, prelink_cache_t, file) +files_etc_filetrans(prelink_t,prelink_cache_t,file) +files_var_lib_filetrans(prelink_t,prelink_cache_t,file) allow prelink_t prelink_log_t:dir setattr; create_files_pattern(prelink_t,prelink_log_t,prelink_log_t) append_files_pattern(prelink_t,prelink_log_t,prelink_log_t) read_lnk_files_pattern(prelink_t,prelink_log_t,prelink_log_t) -logging_log_filetrans(prelink_t, prelink_log_t, file) +logging_log_filetrans(prelink_t,prelink_log_t,file) allow prelink_t prelink_tmp_t:file { manage_file_perms execute relabelfrom }; -files_tmp_filetrans(prelink_t, prelink_tmp_t, file) -fs_tmpfs_filetrans(prelink_t, prelink_tmp_t, file) +files_tmp_filetrans(prelink_t,prelink_tmp_t,file) +fs_tmpfs_filetrans(prelink_t,prelink_tmp_t,file) # prelink misc objects that are not system # libraries or entrypoints @@ -86,5 +86,5 @@ ') optional_policy(` - cron_system_entry(prelink_t, prelink_exec_t) + cron_system_entry(prelink_t,prelink_exec_t) ') Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/logwatch.te =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/logwatch.te (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/logwatch.te (working copy) @@ -38,7 +38,7 @@ manage_dirs_pattern(logwatch_t,logwatch_tmp_t,logwatch_tmp_t) manage_files_pattern(logwatch_t,logwatch_tmp_t,logwatch_tmp_t) -files_tmp_filetrans(logwatch_t, logwatch_tmp_t, { file dir }) +files_tmp_filetrans(logwatch_t,logwatch_tmp_t,{ file dir }) kernel_read_fs_sysctls(logwatch_t) kernel_read_kernel_sysctls(logwatch_t) @@ -110,7 +110,7 @@ ') optional_policy(` - cron_system_entry(logwatch_t, logwatch_exec_t) + cron_system_entry(logwatch_t,logwatch_exec_t) ') optional_policy(` Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/ddcprobe.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/ddcprobe.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/ddcprobe.if (working copy) @@ -12,7 +12,7 @@ # interface(`ddcprobe_domtrans',` gen_require(` - type ddcprobe_t, ddcprobe_exec_t; + type ddcprobe_t,ddcprobe_exec_t; ') domtrans_pattern($1,ddcprobe_exec_t,ddcprobe_t) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/quota.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/quota.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/quota.if (working copy) @@ -12,7 +12,7 @@ # interface(`quota_domtrans',` gen_require(` - type quota_t, quota_exec_t; + type quota_t,quota_exec_t; ') domtrans_pattern($1,quota_exec_t,quota_t) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/amanda.te =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/amanda.te (revision 2761) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/amanda.te (working copy) @@ -105,7 +105,7 @@ manage_files_pattern(amanda_t,amanda_tmp_t,amanda_tmp_t) manage_dirs_pattern(amanda_t,amanda_tmp_t,amanda_tmp_t) -files_tmp_filetrans(amanda_t, amanda_tmp_t, { file dir }) +files_tmp_filetrans(amanda_t,amanda_tmp_t,{ file dir }) kernel_read_system_state(amanda_t) kernel_read_kernel_sysctls(amanda_t) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/dmesg.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/dmesg.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/dmesg.if (working copy) @@ -12,11 +12,11 @@ # interface(`dmesg_domtrans',` gen_require(` - type dmesg_t, dmesg_exec_t; + type dmesg_t,dmesg_exec_t; ') corecmd_search_bin($1) - domtrans_pattern($1, dmesg_exec_t, dmesg_t) + domtrans_pattern($1,dmesg_exec_t,dmesg_t) ') ######################################## Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/logrotate.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/logrotate.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/logrotate.if (working copy) @@ -12,7 +12,7 @@ # interface(`logrotate_domtrans',` gen_require(` - type logrotate_t, logrotate_exec_t; + type logrotate_t,logrotate_exec_t; ') domtrans_pattern($1,logrotate_exec_t,logrotate_t) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/usermanage.te =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/usermanage.te (revision 2761) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/usermanage.te (working copy) @@ -138,7 +138,7 @@ manage_dirs_pattern(crack_t,crack_tmp_t,crack_tmp_t) manage_files_pattern(crack_t,crack_tmp_t,crack_tmp_t) -files_tmp_filetrans(crack_t, crack_tmp_t, { file dir }) +files_tmp_filetrans(crack_t,crack_tmp_t,{ file dir }) kernel_read_system_state(crack_t) @@ -363,7 +363,7 @@ # allow vipw to create temporary files under /var/tmp/vi.recover manage_dirs_pattern(sysadm_passwd_t,sysadm_passwd_tmp_t,sysadm_passwd_tmp_t) manage_files_pattern(sysadm_passwd_t,sysadm_passwd_tmp_t,sysadm_passwd_tmp_t) -files_tmp_filetrans(sysadm_passwd_t, sysadm_passwd_tmp_t, { file dir }) +files_tmp_filetrans(sysadm_passwd_t,sysadm_passwd_tmp_t,{ file dir }) files_search_var(sysadm_passwd_t) files_dontaudit_search_home(sysadm_passwd_t) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/prelink.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/prelink.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/prelink.if (working copy) @@ -12,11 +12,11 @@ # interface(`prelink_domtrans',` gen_require(` - type prelink_t, prelink_exec_t; + type prelink_t,prelink_exec_t; ') corecmd_search_bin($1) - domtrans_pattern($1, prelink_exec_t, prelink_t) + domtrans_pattern($1,prelink_exec_t,prelink_t) ') ######################################## Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/readahead.te =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/readahead.te (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/readahead.te (working copy) @@ -83,7 +83,7 @@ sysadm_dontaudit_search_home_dirs(readahead_t) optional_policy(` - cron_system_entry(readahead_t, readahead_exec_t) + cron_system_entry(readahead_t,readahead_exec_t) ') optional_policy(` Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/portage.te =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/portage.te (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/portage.te (working copy) @@ -166,7 +166,7 @@ # this rule is outside of the above macro to fix conflicting type # transitions seen in the rules for the constraining type (portage_t) -files_tmp_filetrans(portage_t.fetch, portage_fetch_tmp_t, { file dir }) +files_tmp_filetrans(portage_t.fetch,portage_fetch_tmp_t,{ file dir }) ########################################## # Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/brctl.te =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/brctl.te (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/brctl.te (working copy) @@ -8,7 +8,7 @@ type brctl_t; type brctl_exec_t; domain_type(brctl_t) -init_system_domain(brctl_t, brctl_exec_t) +init_system_domain(brctl_t,brctl_exec_t) ######################################## # Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/netutils.te =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/netutils.te (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/netutils.te (working copy) @@ -47,7 +47,7 @@ manage_dirs_pattern(netutils_t,netutils_tmp_t,netutils_tmp_t) manage_files_pattern(netutils_t,netutils_tmp_t,netutils_tmp_t) -files_tmp_filetrans(netutils_t, netutils_tmp_t, { file dir }) +files_tmp_filetrans(netutils_t,netutils_tmp_t,{ file dir }) kernel_search_proc(netutils_t) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/amanda.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/amanda.if (revision 2761) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/amanda.if (working copy) @@ -12,7 +12,7 @@ # interface(`amanda_domtrans_recover',` gen_require(` - type amanda_recover_t, amanda_recover_exec_t; + type amanda_recover_t,amanda_recover_exec_t; ') domtrans_pattern($1,amanda_recover_exec_t,amanda_recover_t) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/usermanage.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/usermanage.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/usermanage.if (working copy) @@ -12,7 +12,7 @@ # interface(`usermanage_domtrans_chfn',` gen_require(` - type chfn_t, chfn_exec_t; + type chfn_t,chfn_exec_t; ') files_search_usr($1) @@ -63,7 +63,7 @@ # interface(`usermanage_domtrans_groupadd',` gen_require(` - type groupadd_t, groupadd_exec_t; + type groupadd_t,groupadd_exec_t; ') files_search_usr($1) @@ -103,7 +103,7 @@ allow groupadd_t $3:chr_file rw_term_perms; optional_policy(` - nscd_run(groupadd_t, $2, $3) + nscd_run(groupadd_t,$2,$3) ') ') @@ -119,7 +119,7 @@ # interface(`usermanage_domtrans_passwd',` gen_require(` - type passwd_t, passwd_exec_t; + type passwd_t,passwd_exec_t; ') files_search_usr($1) @@ -171,7 +171,7 @@ # interface(`usermanage_domtrans_admin_passwd',` gen_require(` - type sysadm_passwd_t, admin_passwd_exec_t; + type sysadm_passwd_t,admin_passwd_exec_t; ') files_search_usr($1) @@ -212,7 +212,7 @@ allow sysadm_passwd_t $3:chr_file rw_term_perms; optional_policy(` - nscd_run(sysadm_passwd_t, $2, $3) + nscd_run(sysadm_passwd_t,$2,$3) ') ') @@ -246,7 +246,7 @@ # interface(`usermanage_domtrans_useradd',` gen_require(` - type useradd_t, useradd_exec_t; + type useradd_t,useradd_exec_t; ') files_search_usr($1) @@ -286,7 +286,7 @@ allow useradd_t $3:chr_file rw_term_perms; optional_policy(` - nscd_run(useradd_t, $2, $3) + nscd_run(useradd_t,$2,$3) ') ') Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/bootloader.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/bootloader.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/bootloader.if (working copy) @@ -12,10 +12,10 @@ # interface(`bootloader_domtrans',` gen_require(` - type bootloader_t, bootloader_exec_t; + type bootloader_t,bootloader_exec_t; ') - domtrans_pattern($1, bootloader_exec_t, bootloader_t) + domtrans_pattern($1,bootloader_exec_t,bootloader_t) ') ######################################## Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/alsa.te =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/alsa.te (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/alsa.te (working copy) @@ -29,14 +29,14 @@ allow alsa_t self:unix_stream_socket create_stream_socket_perms; allow alsa_t self:unix_dgram_socket create_socket_perms; -manage_files_pattern(alsa_t, alsa_etc_rw_t, alsa_etc_rw_t) -manage_lnk_files_pattern(alsa_t, alsa_etc_rw_t, alsa_etc_rw_t) -files_etc_filetrans(alsa_t, alsa_etc_rw_t, file) +manage_files_pattern(alsa_t,alsa_etc_rw_t,alsa_etc_rw_t) +manage_lnk_files_pattern(alsa_t,alsa_etc_rw_t,alsa_etc_rw_t) +files_etc_filetrans(alsa_t,alsa_etc_rw_t,file) -can_exec(alsa_t, alsa_exec_t) +can_exec(alsa_t,alsa_exec_t) -manage_dirs_pattern(alsa_t, alsa_var_lib_t, alsa_var_lib_t) -manage_files_pattern(alsa_t, alsa_var_lib_t, alsa_var_lib_t) +manage_dirs_pattern(alsa_t,alsa_var_lib_t,alsa_var_lib_t) +manage_files_pattern(alsa_t,alsa_var_lib_t,alsa_var_lib_t) files_search_var_lib(alsa_t) kernel_read_system_state(alsa_t) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/dpkg.te =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/dpkg.te (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/dpkg.te (working copy) @@ -71,7 +71,7 @@ manage_dirs_pattern(dpkg_t,dpkg_tmp_t,dpkg_tmp_t) manage_files_pattern(dpkg_t,dpkg_tmp_t,dpkg_tmp_t) -files_tmp_filetrans(dpkg_t, dpkg_tmp_t, { file dir }) +files_tmp_filetrans(dpkg_t,dpkg_tmp_t,{ file dir }) manage_dirs_pattern(dpkg_t,dpkg_tmpfs_t,dpkg_tmpfs_t) manage_files_pattern(dpkg_t,dpkg_tmpfs_t,dpkg_tmpfs_t) @@ -233,7 +233,7 @@ allow dpkg_script_t dpkg_script_tmp_t:dir { manage_dir_perms mounton }; allow dpkg_script_t dpkg_script_tmp_t:file manage_file_perms; -files_tmp_filetrans(dpkg_script_t, dpkg_script_tmp_t, { file dir }) +files_tmp_filetrans(dpkg_script_t,dpkg_script_tmp_t,{ file dir }) allow dpkg_script_t dpkg_script_tmpfs_t:dir manage_dir_perms; allow dpkg_script_t dpkg_script_tmpfs_t:file manage_file_perms; Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/portage.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/portage.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/portage.if (working copy) @@ -15,7 +15,7 @@ # interface(`portage_domtrans',` gen_require(` - type portage_t, portage_t.merge, portage_exec_t; + type portage_t,portage_t.merge,portage_exec_t; ') files_search_usr($1) @@ -92,7 +92,7 @@ gen_require(` class dbus send_msg; - type portage_devpts_t, portage_log_t, portage_tmp_t; + type portage_devpts_t,portage_log_t,portage_tmp_t; type portage_tmpfs_t; ') @@ -222,8 +222,8 @@ # interface(`portage_fetch_domain',` gen_require(` - type portage_cache_t, portage_conf_t, portage_ebuild_t; - type portage_tmp_t, portage_fetch_tmp_t; + type portage_cache_t,portage_conf_t,portage_ebuild_t; + type portage_tmp_t,portage_fetch_tmp_t; ') allow $1 self:capability { dac_override fowner fsetid }; @@ -297,7 +297,7 @@ # interface(`portage_main_domain',` gen_require(` - type portage_log_t, portage_tmp_t; + type portage_log_t,portage_tmp_t; ') # - setfscreate for merging to live fs @@ -372,7 +372,7 @@ # interface(`portage_domtrans_gcc_config',` gen_require(` - type gcc_config_t, gcc_config_exec_t; + type gcc_config_t,gcc_config_exec_t; ') files_search_usr($1) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/tzdata.te =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/tzdata.te (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/tzdata.te (working copy) @@ -8,8 +8,8 @@ type tzdata_t; type tzdata_exec_t; -init_daemon_domain(tzdata_t, tzdata_exec_t) -application_domain(tzdata_t, tzdata_exec_t) +init_daemon_domain(tzdata_t,tzdata_exec_t) +application_domain(tzdata_t,tzdata_exec_t) ######################################## # Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/kismet.te =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/kismet.te (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/kismet.te (working copy) @@ -1,5 +1,5 @@ -policy_module(kismet, 1.0.0) +policy_module(kismet,1.0.0) ######################################## # @@ -8,7 +8,7 @@ type kismet_t; type kismet_exec_t; -application_domain(kismet_t, kismet_exec_t) +application_domain(kismet_t,kismet_exec_t) role system_r types kismet_t; type kismet_var_run_t; @@ -27,17 +27,17 @@ allow kismet_t self:capability { net_admin setuid setgid }; -manage_files_pattern(kismet_t, kismet_log_t, kismet_log_t) +manage_files_pattern(kismet_t,kismet_log_t,kismet_log_t) allow kismet_t kismet_log_t:dir setattr; -logging_log_filetrans(kismet_t, kismet_log_t, { file dir }) +logging_log_filetrans(kismet_t,kismet_log_t,{ file dir }) allow kismet_t kismet_var_lib_t:file manage_file_perms; allow kismet_t kismet_var_lib_t:dir manage_dir_perms; -files_var_lib_filetrans(kismet_t, kismet_var_lib_t, { file dir }) +files_var_lib_filetrans(kismet_t,kismet_var_lib_t,{ file dir }) allow kismet_t kismet_var_run_t:file manage_file_perms; allow kismet_t kismet_var_run_t:dir manage_dir_perms; -files_pid_filetrans(kismet_t, kismet_var_run_t, { file dir }) +files_pid_filetrans(kismet_t,kismet_var_run_t,{ file dir }) corecmd_exec_bin(kismet_t) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/brctl.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/brctl.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/brctl.if (working copy) @@ -12,7 +12,7 @@ # interface(`brctl_domtrans',` gen_require(` - type brctl_t, brctl_exec_t; + type brctl_t,brctl_exec_t; ') domtrans_pattern($1,brctl_exec_t,brctl_t) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/netutils.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/netutils.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/netutils.if (working copy) @@ -12,7 +12,7 @@ # interface(`netutils_domtrans',` gen_require(` - type netutils_t, netutils_exec_t; + type netutils_t,netutils_exec_t; ') domtrans_pattern($1,netutils_exec_t,netutils_t) @@ -80,7 +80,7 @@ # interface(`netutils_domtrans_ping',` gen_require(` - type ping_t, ping_exec_t; + type ping_t,ping_exec_t; ') domtrans_pattern($1,ping_exec_t,ping_t) @@ -220,7 +220,7 @@ # interface(`netutils_domtrans_traceroute',` gen_require(` - type traceroute_t, traceroute_exec_t; + type traceroute_t,traceroute_exec_t; ') domtrans_pattern($1,traceroute_exec_t,traceroute_t) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/acct.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/acct.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/acct.if (working copy) @@ -12,7 +12,7 @@ # interface(`acct_domtrans',` gen_require(` - type acct_t, acct_exec_t; + type acct_t,acct_exec_t; ') corecmd_search_bin($1) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/sudo.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/sudo.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/sudo.if (working copy) @@ -71,7 +71,7 @@ allow $1_sudo_t self:netlink_audit_socket { create bind write nlmsg_read read }; # Enter this derived domain from the user domain - domtrans_pattern($2, sudo_exec_t, $1_sudo_t) + domtrans_pattern($2,sudo_exec_t,$1_sudo_t) # By default, revert to the calling domain when a shell is executed. corecmd_shell_domtrans($1_sudo_t,$2) @@ -130,7 +130,7 @@ dontaudit unpriv_userdomain $1_sudo_t:process signal; ifdef(`mta.te', ` - domain_auto_trans($1_sudo_t, sendmail_exec_t, $1_mail_t) + domain_auto_trans($1_sudo_t,sendmail_exec_t,$1_mail_t) ') ') dnl end TODO Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/vpn.te =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/vpn.te (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/vpn.te (working copy) @@ -8,7 +8,7 @@ type vpnc_t; type vpnc_exec_t; -application_domain(vpnc_t, vpnc_exec_t) +application_domain(vpnc_t,vpnc_exec_t) role system_r types vpnc_t; type vpnc_tmp_t; @@ -33,13 +33,13 @@ # cjp: this needs to be fixed allow vpnc_t self:socket create_socket_perms; -manage_dirs_pattern(vpnc_t, vpnc_tmp_t, vpnc_tmp_t) -manage_files_pattern(vpnc_t, vpnc_tmp_t, vpnc_tmp_t) -files_tmp_filetrans(vpnc_t, vpnc_tmp_t, { file dir }) +manage_dirs_pattern(vpnc_t,vpnc_tmp_t,vpnc_tmp_t) +manage_files_pattern(vpnc_t,vpnc_tmp_t,vpnc_tmp_t) +files_tmp_filetrans(vpnc_t,vpnc_tmp_t,{ file dir }) -manage_dirs_pattern(vpnc_t, vpnc_var_run_t, vpnc_var_run_t) -manage_files_pattern(vpnc_t, vpnc_var_run_t, vpnc_var_run_t) -files_pid_filetrans(vpnc_t, vpnc_var_run_t, { file dir}) +manage_dirs_pattern(vpnc_t,vpnc_var_run_t,vpnc_var_run_t) +manage_files_pattern(vpnc_t,vpnc_var_run_t,vpnc_var_run_t) +files_pid_filetrans(vpnc_t,vpnc_var_run_t,{ file dir}) kernel_read_system_state(vpnc_t) kernel_read_network_state(vpnc_t) @@ -110,7 +110,7 @@ userdom_dontaudit_search_all_users_home_content(vpnc_t) optional_policy(` - dbus_system_bus_client_template(vpnc, vpnc_t) + dbus_system_bus_client_template(vpnc,vpnc_t) optional_policy(` networkmanager_dbus_chat(vpnc_t) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/alsa.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/alsa.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/alsa.if (working copy) @@ -12,11 +12,10 @@ # interface(`alsa_domtrans',` gen_require(` - type alsa_t; - type alsa_exec_t; + type alsa_t,alsa_exec_t; ') - domtrans_pattern($1, alsa_exec_t, alsa_t) + domtrans_pattern($1,alsa_exec_t,alsa_t) ') ######################################## @@ -90,5 +89,5 @@ type alsa_var_lib_t; ') - read_files_pattern($1, alsa_var_lib_t, alsa_var_lib_t) + read_files_pattern($1,alsa_var_lib_t,alsa_var_lib_t) ') Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/certwatch.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/certwatch.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/certwatch.if (working copy) @@ -12,7 +12,7 @@ # interface(`certwatch_domtrans',` gen_require(` - type certwatch_exec_t, certwatch_t; + type certwatch_exec_t,certwatch_t; ') files_search_usr($1) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/dpkg.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/dpkg.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/dpkg.if (working copy) @@ -14,7 +14,7 @@ # interface(`dpkg_domtrans',` gen_require(` - type dpkg_t, dpkg_exec_t; + type dpkg_t,dpkg_exec_t; ') files_search_usr($1) @@ -67,7 +67,7 @@ # interface(`dpkg_run',` gen_require(` - type dpkg_t, dpkg_script_t; + type dpkg_t,dpkg_script_t; ') dpkg_domtrans($1) @@ -223,7 +223,7 @@ # interface(`dpkg_lock_db',` gen_require(` - type dpkg_lock_t, dpkg_var_lib_t; + type dpkg_lock_t,dpkg_var_lib_t; ') files_search_var_lib($1) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/su.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/su.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/su.if (working copy) @@ -50,7 +50,7 @@ allow $1_su_t self:unix_stream_socket create_stream_socket_perms; # Transition from the user domain to this domain. - domtrans_pattern($2, su_exec_t, $1_su_t) + domtrans_pattern($2,su_exec_t,$1_su_t) # By default, revert to the calling domain when a shell is executed. corecmd_shell_domtrans($1_su_t,$2) @@ -182,7 +182,7 @@ allow $1_su_t self:key { search write }; # Transition from the user domain to this domain. - domtrans_pattern($2, su_exec_t, $1_su_t) + domtrans_pattern($2,su_exec_t,$1_su_t) # By default, revert to the calling domain when a shell is executed. corecmd_shell_domtrans($1_su_t,$2) @@ -291,8 +291,8 @@ # Modify .Xauthority file (via xauth program). optional_policy(` - xserver_user_home_dir_filetrans_user_xauth($1, su_domain_type) - xserver_domtrans_user_xauth($1, $1_su_t) + xserver_user_home_dir_filetrans_user_xauth($1,su_domain_type) + xserver_domtrans_user_xauth($1,$1_su_t) ') ifdef(`TODO',` @@ -300,7 +300,7 @@ # Access sshd cookie files. allow $1_su_t sshd_tmp_t:file rw_file_perms; - file_type_auto_trans($1_su_t, sshd_tmp_t, $1_tmp_t) + file_type_auto_trans($1_su_t,sshd_tmp_t,$1_tmp_t) ') dnl end TODO ') Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/tzdata.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/tzdata.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/tzdata.if (working copy) @@ -12,7 +12,7 @@ # interface(`tzdata_domtrans',` gen_require(` - type tzdata_t, tzdata_exec_t; + type tzdata_t,tzdata_exec_t; ') domtrans_pattern($1,tzdata_exec_t,tzdata_t) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/kismet.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/kismet.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/kismet.if (working copy) @@ -12,10 +12,10 @@ # interface(`kismet_domtrans',` gen_require(` - type kismet_t, kismet_exec_t; + type kismet_t,kismet_exec_t; ') - domtrans_pattern($1, kismet_exec_t, kismet_t) + domtrans_pattern($1,kismet_exec_t,kismet_t) ') ######################################## @@ -142,7 +142,7 @@ type kismet_var_lib_t; ') - manage_files_pattern($1, kismet_var_lib_t, kismet_var_lib_t) + manage_files_pattern($1,kismet_var_lib_t,kismet_var_lib_t) files_search_var_lib($1) ') @@ -161,9 +161,9 @@ type kismet_var_lib_t; ') - manage_dirs_pattern($1, kismet_var_lib_t, kismet_var_lib_t) - manage_files_pattern($1, kismet_var_lib_t, kismet_var_lib_t) - manage_lnk_files_pattern($1, kismet_var_lib_t, kismet_var_lib_t) + manage_dirs_pattern($1,kismet_var_lib_t,kismet_var_lib_t) + manage_files_pattern($1,kismet_var_lib_t,kismet_var_lib_t) + manage_lnk_files_pattern($1,kismet_var_lib_t,kismet_var_lib_t) ') ######################################## @@ -183,7 +183,7 @@ ') logging_search_logs($1) - read_files_pattern($1, kismet_log_t, kismet_log_t) + read_files_pattern($1,kismet_log_t,kismet_log_t) ') ######################################## @@ -203,7 +203,7 @@ ') logging_search_logs($1) - append_files_pattern($1, kismet_log_t, kismet_log_t) + append_files_pattern($1,kismet_log_t,kismet_log_t) ') ######################################## @@ -221,9 +221,9 @@ type kismet_log_t; ') - manage_dirs_pattern($1, kismet_log_t, kismet_log_t) - manage_files_pattern($1, kismet_log_t, kismet_log_t) - manage_lnk_files_pattern($1, kismet_log_t, kismet_log_t) + manage_dirs_pattern($1,kismet_log_t,kismet_log_t) + manage_files_pattern($1,kismet_log_t,kismet_log_t) + manage_lnk_files_pattern($1,kismet_log_t,kismet_log_t) logging_search_logs($1) ') @@ -243,7 +243,7 @@ type kismet_t; ') - ps_process_pattern($1, kismet_t) + ps_process_pattern($1,kismet_t) allow $1 kismet_t:process { ptrace signal_perms }; kismet_manage_pid_files($1) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/apt.te =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/apt.te (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/apt.te (working copy) @@ -59,7 +59,7 @@ manage_dirs_pattern(apt_t,apt_tmp_t,apt_tmp_t) manage_files_pattern(apt_t,apt_tmp_t,apt_tmp_t) -files_tmp_filetrans(apt_t, apt_tmp_t, { file dir }) +files_tmp_filetrans(apt_t,apt_tmp_t,{ file dir }) manage_dirs_pattern(apt_t,apt_tmpfs_t,apt_tmpfs_t) manage_files_pattern(apt_t,apt_tmpfs_t,apt_tmpfs_t) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/vpn.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/vpn.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/vpn.if (working copy) @@ -12,10 +12,10 @@ # interface(`vpn_domtrans',` gen_require(` - type vpnc_t, vpnc_exec_t; + type vpnc_t,vpnc_exec_t; ') - domtrans_pattern($1, vpnc_exec_t,vpnc_t) + domtrans_pattern($1,vpnc_exec_t,vpnc_t) ') ######################################## Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/consoletype.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/consoletype.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/consoletype.if (working copy) @@ -14,7 +14,7 @@ # interface(`consoletype_domtrans',` gen_require(` - type consoletype_t, consoletype_exec_t; + type consoletype_t,consoletype_exec_t; ') corecmd_search_bin($1) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/rpm.te =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/rpm.te (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/rpm.te (working copy) @@ -76,7 +76,7 @@ manage_dirs_pattern(rpm_t,rpm_tmp_t,rpm_tmp_t) manage_files_pattern(rpm_t,rpm_tmp_t,rpm_tmp_t) -files_tmp_filetrans(rpm_t, rpm_tmp_t, { file dir }) +files_tmp_filetrans(rpm_t,rpm_tmp_t,{ file dir }) manage_dirs_pattern(rpm_t,rpm_tmpfs_t,rpm_tmpfs_t) manage_files_pattern(rpm_t,rpm_tmpfs_t,rpm_tmpfs_t) @@ -233,7 +233,7 @@ allow rpm_script_t rpm_script_tmp_t:dir mounton; manage_dirs_pattern(rpm_script_t,rpm_script_tmp_t,rpm_script_tmp_t) manage_files_pattern(rpm_script_t,rpm_script_tmp_t,rpm_script_tmp_t) -files_tmp_filetrans(rpm_script_t, rpm_script_tmp_t, { file dir }) +files_tmp_filetrans(rpm_script_t,rpm_script_tmp_t,{ file dir }) manage_dirs_pattern(rpm_script_t,rpm_script_tmpfs_t,rpm_script_tmpfs_t) manage_files_pattern(rpm_script_t,rpm_script_tmpfs_t,rpm_script_tmpfs_t) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/updfstab.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/updfstab.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/updfstab.if (working copy) @@ -12,7 +12,7 @@ # interface(`updfstab_domtrans',` gen_require(` - type updfstab_t, updfstab_exec_t; + type updfstab_t,updfstab_exec_t; ') files_search_usr($1) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/kudzu.te =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/kudzu.te (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/kudzu.te (working copy) @@ -32,7 +32,7 @@ manage_dirs_pattern(kudzu_t,kudzu_tmp_t,kudzu_tmp_t) manage_files_pattern(kudzu_t,kudzu_tmp_t,kudzu_tmp_t) manage_chr_files_pattern(kudzu_t,kudzu_tmp_t,kudzu_tmp_t) -files_tmp_filetrans(kudzu_t, kudzu_tmp_t, { file dir chr_file }) +files_tmp_filetrans(kudzu_t,kudzu_tmp_t,{ file dir chr_file }) manage_dirs_pattern(kudzu_t,kudzu_var_run_t,kudzu_var_run_t) manage_files_pattern(kudzu_t,kudzu_var_run_t,kudzu_var_run_t) @@ -135,11 +135,11 @@ ') optional_policy(` - seutil_sigchld_newrole(kudzu_t) + seutil_sigchld_newrole(kudzu_t) ') optional_policy(` - udev_read_db(kudzu_t) + udev_read_db(kudzu_t) ') optional_policy(` @@ -164,7 +164,7 @@ ') optional_policy(` role system_r types sysadm_userhelper_t; - domain_auto_trans(kudzu_t, userhelper_exec_t, sysadm_userhelper_t) + domain_auto_trans(kudzu_t,userhelper_exec_t,sysadm_userhelper_t) ') allow kudzu_t cupsd_rw_etc_t:dir list_dir_perms; ') Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/dmidecode.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/dmidecode.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/dmidecode.if (working copy) @@ -12,7 +12,7 @@ # interface(`dmidecode_domtrans',` gen_require(` - type dmidecode_t, dmidecode_exec_t; + type dmidecode_t,dmidecode_exec_t; ') domain_auto_trans($1,dmidecode_exec_t,dmidecode_t) Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/tripwire.te =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/tripwire.te (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/tripwire.te (working copy) @@ -1,4 +1,3 @@ - policy_module(tripwire,1.1.0) ######################################## Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/amtu.te =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/amtu.te (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/amtu.te (working copy) @@ -8,7 +8,7 @@ type amtu_t; type amtu_exec_t; domain_type(amtu_t) -domain_entry_file(amtu_t, amtu_exec_t) +domain_entry_file(amtu_t,amtu_exec_t) ######################################## # Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/sxid.te =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/sxid.te (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/admin/sxid.te (working copy) @@ -33,7 +33,7 @@ manage_dirs_pattern(sxid_t,sxid_tmp_t,sxid_tmp_t) manage_files_pattern(sxid_t,sxid_tmp_t,sxid_tmp_t) -files_tmp_filetrans(sxid_t, sxid_tmp_t, { file dir }) +files_tmp_filetrans(sxid_t,sxid_tmp_t,{ file dir }) kernel_read_system_state(sxid_t) kernel_read_kernel_sysctls(sxid_t)
Attachment:
signature.asc
Description: This is a digitally signed message part