This patch aims to remove any duplicate delimiter. -- Dominick Grift <domg472@xxxxxxxxx>
Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/roles/unprivuser.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/roles/unprivuser.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/roles/unprivuser.if (working copy) @@ -13,7 +13,7 @@ ## <rolecap/> # template(`unprivuser_role_change_template',` - userdom_role_change_template($1, user) + userdom_role_change_template($1,user) ') ######################################## @@ -40,7 +40,7 @@ ## <rolecap/> # template(`unprivuser_role_change_to_template',` - userdom_role_change_template(user, $1) + userdom_role_change_template(user,$1) ') ######################################## @@ -99,7 +99,7 @@ # interface(`unprivuser_home_dir_filetrans_home_content',` gen_require(` - type user_home_dir_t, user_home_t; + type user_home_dir_t,user_home_t; ') files_search_home($1) @@ -158,7 +158,7 @@ # interface(`unprivuser_manage_home_content_dirs',` gen_require(` - type user_home_dir_t, user_home_t; + type user_home_dir_t,user_home_t; ') files_search_home($1) @@ -196,7 +196,7 @@ # interface(`unprivuser_read_home_content_files',` gen_require(` - type user_home_t, user_home_dir_t; + type user_home_t,user_home_dir_t; ') files_search_home($1) @@ -237,7 +237,7 @@ # interface(`unprivuser_manage_home_content_files',` gen_require(` - type user_home_dir_t, user_home_t; + type user_home_dir_t,user_home_t; ') files_search_home($1) @@ -276,7 +276,7 @@ # interface(`unprivuser_manage_home_content_symlinks',` gen_require(` - type user_home_dir_t, user_home_t; + type user_home_dir_t,user_home_t; ') files_search_home($1) @@ -296,7 +296,7 @@ # interface(`unprivuser_manage_home_content_pipes',` gen_require(` - type user_home_dir_t, user_home_t; + type user_home_dir_t,user_home_t; ') files_search_home($1) @@ -316,10 +316,9 @@ # interface(`unprivuser_manage_home_content_sockets',` gen_require(` - type user_home_dir_t, user_home_t; + type user_home_dir_t,user_home_t; ') files_search_home($1) manage_sock_files_pattern($1,{ user_home_dir_t user_home_t },user_home_t) ') - Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/roles/auditadm.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/roles/auditadm.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/roles/auditadm.if (working copy) @@ -13,7 +13,7 @@ ## <rolecap/> # template(`auditadm_role_change_template',` - userdom_role_change_template($1, auditadm) + userdom_role_change_template($1,auditadm) ') ######################################## @@ -40,6 +40,6 @@ ## <rolecap/> # template(`auditadm_role_change_to_template',` - userdom_role_change_template(auditadm, $1) + userdom_role_change_template(auditadm,$1) ') Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/roles/unprivuser.te =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/roles/unprivuser.te (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/roles/unprivuser.te (working copy) @@ -1,5 +1,5 @@ -policy_module(unprivuser, 1.0.0) +policy_module(unprivuser,1.0.0) # this module should be named user, but that is # a compile error since user is a keyword. Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/roles/secadm.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/roles/secadm.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/roles/secadm.if (working copy) @@ -13,7 +13,7 @@ ## <rolecap/> # template(`secadm_role_change_template',` - userdom_role_change_template($1, secadm) + userdom_role_change_template($1,secadm) ') ######################################## @@ -40,6 +40,6 @@ ## <rolecap/> # template(`secadm_role_change_to_template',` - userdom_role_change_template(secadm, $1) + userdom_role_change_template(secadm,$1) ') Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/roles/sysadm.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/roles/sysadm.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/roles/sysadm.if (working copy) @@ -13,7 +13,7 @@ ## <rolecap/> # template(`sysadm_role_change_template',` - userdom_role_change_template($1, sysadm) + userdom_role_change_template($1,sysadm) ') ######################################## @@ -40,7 +40,7 @@ ## <rolecap/> # template(`sysadm_role_change_to_template',` - userdom_role_change_template(sysadm, $1) + userdom_role_change_template(sysadm,$1) ') ######################################## @@ -58,7 +58,7 @@ type sysadm_t; ') - corecmd_shell_domtrans($1, sysadm_t) + corecmd_shell_domtrans($1,sysadm_t) allow sysadm_t $1:fd use; allow sysadm_t $1:fifo_file rw_file_perms; allow sysadm_t $1:process sigchld; @@ -79,7 +79,7 @@ type sysadm_t; ') - corecmd_bin_spec_domtrans($1, sysadm_t) + corecmd_bin_spec_domtrans($1,sysadm_t) allow sysadm_t $1:fd use; allow sysadm_t $1:fifo_file rw_file_perms; allow sysadm_t $1:process sigchld; @@ -102,7 +102,7 @@ type sysadm_t; ') - domain_entry_file_spec_domtrans($1, sysadm_t) + domain_entry_file_spec_domtrans($1,sysadm_t) allow sysadm_t $1:fd use; allow sysadm_t $1:fifo_file rw_file_perms; allow sysadm_t $1:process sigchld; @@ -136,7 +136,7 @@ type sysadm_t; ') - corecmd_bin_spec_domtrans(sysadm_t, $1) + corecmd_bin_spec_domtrans(sysadm_t,$1) allow $1 sysadm_t:fd use; allow $1 sysadm_t:fifo_file rw_file_perms; allow $1 sysadm_t:process sigchld; @@ -461,7 +461,7 @@ type sysadm_home_dir_t; ') - filetrans_pattern($1, sysadm_home_dir_t, $2, $3) + filetrans_pattern($1,sysadm_home_dir_t,$2,$3) ') ######################################## @@ -476,7 +476,7 @@ # interface(`sysadm_search_home_content_dirs',` gen_require(` - type sysadm_home_dir_t, sysadm_home_t; + type sysadm_home_dir_t,sysadm_home_t; ') allow $1 { sysadm_home_dir_t sysadm_home_t }:dir search_dir_perms; @@ -494,13 +494,13 @@ # interface(`sysadm_read_home_content_files',` gen_require(` - type sysadm_home_dir_t, sysadm_home_t; + type sysadm_home_dir_t,sysadm_home_t; ') files_search_home($1) allow $1 { sysadm_home_dir_t sysadm_home_t }:dir list_dir_perms; - read_files_pattern($1, { sysadm_home_dir_t sysadm_home_t }, sysadm_home_t) - read_lnk_files_pattern($1, { sysadm_home_dir_t sysadm_home_t }, sysadm_home_t) + read_files_pattern($1,{ sysadm_home_dir_t sysadm_home_t },sysadm_home_t) + read_lnk_files_pattern($1,{ sysadm_home_dir_t sysadm_home_t },sysadm_home_t) ') ######################################## @@ -516,7 +516,7 @@ # interface(`sysadm_dontaudit_read_home_content_files',` gen_require(` - type sysadm_home_dir_t, sysadm_home_t; + type sysadm_home_dir_t,sysadm_home_t; ') dontaudit $1 sysadm_home_dir_t:dir search_dir_perms; @@ -541,7 +541,6 @@ files_search_tmp($1) allow $1 sysadm_tmp_t:dir list_dir_perms; - read_files_pattern($1, sysadm_tmp_t, sysadm_tmp_t) - read_lnk_files_pattern($1, sysadm_tmp_t, sysadm_tmp_t) + read_files_pattern($1,sysadm_tmp_t,sysadm_tmp_t) + read_lnk_files_pattern($1,sysadm_tmp_t,sysadm_tmp_t) ') - Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/roles/auditadm.te =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/roles/auditadm.te (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/roles/auditadm.te (working copy) @@ -1,5 +1,5 @@ -policy_module(auditadm, 1.0.0) +policy_module(auditadm,1.0.0) ######################################## # @@ -25,10 +25,10 @@ logging_read_generic_logs(auditadm_t) logging_manage_audit_log(auditadm_t) logging_manage_audit_config(auditadm_t) -logging_run_auditctl(auditadm_t, auditadm_r, { auditadm_tty_device_t auditadm_devpts_t }) -logging_run_auditd(auditadm_t, auditadm_r, { auditadm_tty_device_t auditadm_devpts_t }) +logging_run_auditctl(auditadm_t,auditadm_r,{ auditadm_tty_device_t auditadm_devpts_t }) +logging_run_auditd(auditadm_t,auditadm_r,{ auditadm_tty_device_t auditadm_devpts_t }) -seutil_run_runinit(auditadm_t, auditadm_r, { auditadm_tty_device_t auditadm_devpts_t }) +seutil_run_runinit(auditadm_t,auditadm_r,{ auditadm_tty_device_t auditadm_devpts_t }) seutil_read_bin_policy(auditadm_t) optional_policy(` @@ -47,4 +47,3 @@ sysadm_role_change_template(auditadm) sysadm_dontaudit_read_home_content_files(auditadm_t) ') - Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/roles/staff.if =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/roles/staff.if (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/roles/staff.if (working copy) @@ -13,7 +13,7 @@ ## <rolecap/> # template(`staff_role_change_template',` - userdom_role_change_template($1, staff) + userdom_role_change_template($1,staff) ') ######################################## @@ -40,7 +40,7 @@ ## <rolecap/> # template(`staff_role_change_to_template',` - userdom_role_change_template(staff, $1) + userdom_role_change_template(staff,$1) ') ######################################## @@ -151,12 +151,12 @@ # interface(`staff_read_home_content_files',` gen_require(` - type staff_home_dir_t, staff_home_t; + type staff_home_dir_t,staff_home_t; ') files_search_home($1) allow $1 { staff_home_dir_t staff_home_t }:dir list_dir_perms; - read_files_pattern($1, { staff_home_dir_t staff_home_t }, staff_home_t) - read_lnk_files_pattern($1, { staff_home_dir_t staff_home_t }, staff_home_t) + read_files_pattern($1,{ staff_home_dir_t staff_home_t },staff_home_t) + read_lnk_files_pattern($1,{ staff_home_dir_t staff_home_t },staff_home_t) ') Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/roles/secadm.te =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/roles/secadm.te (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/roles/secadm.te (working copy) @@ -1,5 +1,5 @@ -policy_module(secadm, 1.0.0) +policy_module(secadm,1.0.0) ######################################## # @@ -9,7 +9,7 @@ role secadm_r; userdom_unpriv_user_template(secadm) -userdom_security_admin_template(secadm_t, secadm_r, { secadm_tty_device_t secadm_devpts_t }) +userdom_security_admin_template(secadm_t,secadm_r,{ secadm_tty_device_t secadm_devpts_t }) ######################################## # @@ -40,7 +40,7 @@ logging_read_audit_config(secadm_t) optional_policy(` - aide_run(secadm_t, secadm_r, { secadm_tty_device_t secadm_devpts_t }) + aide_run(secadm_t,secadm_r,{ secadm_tty_device_t secadm_devpts_t }) ') optional_policy(` @@ -48,7 +48,7 @@ ') optional_policy(` - netlabel_run_mgmt(secadm_t, secadm_r, { secadm_tty_device_t secadm_devpts_t }) + netlabel_run_mgmt(secadm_t,secadm_r,{ secadm_tty_device_t secadm_devpts_t }) ') optional_policy(` @@ -59,4 +59,3 @@ sysadm_role_change_template(secadm) sysadm_dontaudit_read_home_content_files(secadm_t) ') - Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/roles/sysadm.te =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/roles/sysadm.te (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/roles/sysadm.te (working copy) @@ -1,5 +1,5 @@ -policy_module(sysadm, 1.0.0) +policy_module(sysadm,1.0.0) ######################################## # @@ -18,7 +18,7 @@ userdom_admin_user_template(sysadm) ifndef(`enable_mls',` - userdom_security_admin_template(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + userdom_security_admin_template(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ') ######################################## @@ -38,12 +38,12 @@ ifdef(`direct_sysadm_daemon',` optional_policy(` - init_run_daemon(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + init_run_daemon(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ') ',` ifdef(`distro_gentoo',` optional_policy(` - seutil_init_script_run_runinit(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + seutil_init_script_run_runinit(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ') ') ') @@ -51,7 +51,7 @@ ifndef(`enable_mls',` logging_manage_audit_log(sysadm_t) logging_manage_audit_config(sysadm_t) - logging_run_auditctl(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + logging_run_auditctl(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ') tunable_policy(`allow_ptrace',` @@ -59,11 +59,11 @@ ') optional_policy(` - amanda_run_recover(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + amanda_run_recover(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ') optional_policy(` - apache_run_helper(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + apache_run_helper(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) #apache_run_all_scripts(sysadm_t, sysadm_r) #apache_domtrans_sys_script(sysadm_t) ') @@ -74,7 +74,7 @@ ') optional_policy(` - apt_run(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + apt_run(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ') optional_policy(` @@ -82,31 +82,31 @@ ') optional_policy(` - backup_run(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + backup_run(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ') optional_policy(` - bind_run_ndc(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + bind_run_ndc(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ') optional_policy(` - bootloader_run(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + bootloader_run(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ') optional_policy(` - certwatch_run(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + certwatch_run(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ') optional_policy(` - clock_run(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + clock_run(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ') optional_policy(` - clockspeed_run_cli(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + clockspeed_run_cli(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ') optional_policy(` - consoletype_run(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + consoletype_run(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ') optional_policy(` @@ -118,13 +118,13 @@ ') optional_policy(` - dcc_run_cdcc(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) - dcc_run_client(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) - dcc_run_dbclean(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + dcc_run_cdcc(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) + dcc_run_client(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) + dcc_run_dbclean(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ') optional_policy(` - ddcprobe_run(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + ddcprobe_run(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ') optional_policy(` @@ -132,28 +132,28 @@ ') optional_policy(` - dmidecode_run(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + dmidecode_run(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ') optional_policy(` - dpkg_run(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + dpkg_run(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ') optional_policy(` - ethereal_run_tethereal(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + ethereal_run_tethereal(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ethereal_admin_template(sysadm) ') optional_policy(` - firstboot_run(sysadm_t, sysadm_r, sysadm_tty_device_t) + firstboot_run(sysadm_t,sysadm_r,sysadm_tty_device_t) ') optional_policy(` - fstools_run(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + fstools_run(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ') optional_policy(` - hostname_run(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + hostname_run(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ') optional_policy(` @@ -167,42 +167,42 @@ ') optional_policy(` - iptables_run(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + iptables_run(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ') optional_policy(` - kudzu_run(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + kudzu_run(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ') optional_policy(` - libs_run_ldconfig(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + libs_run_ldconfig(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ') optional_policy(` - logrotate_run(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + logrotate_run(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ') optional_policy(` - lpd_run_checkpc(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + lpd_run_checkpc(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) lpr_admin_template(sysadm) ') optional_policy(` - lvm_run(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + lvm_run(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ') optional_policy(` - modutils_run_depmod(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) - modutils_run_insmod(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) - modutils_run_update_mods(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + modutils_run_depmod(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) + modutils_run_insmod(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) + modutils_run_update_mods(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ') optional_policy(` - mount_run(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + mount_run(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ') optional_policy(` - mta_admin_template(sysadm, sysadm_t) + mta_admin_template(sysadm,sysadm_t) ') optional_policy(` @@ -214,9 +214,9 @@ ') optional_policy(` - netutils_run(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) - netutils_run_ping(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) - netutils_run_traceroute(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + netutils_run(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) + netutils_run_ping(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) + netutils_run_traceroute(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ') optional_policy(` @@ -225,24 +225,24 @@ ') optional_policy(` - oav_run_update(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + oav_run_update(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ') optional_policy(` - pcmcia_run_cardctl(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + pcmcia_run_cardctl(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ') optional_policy(` - portage_run(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) - portage_run_gcc_config(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + portage_run(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) + portage_run_gcc_config(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ') optional_policy(` - portmap_run_helper(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + portmap_run_helper(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ') optional_policy(` - quota_run(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + quota_run(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ') optional_policy(` @@ -254,7 +254,7 @@ ') optional_policy(` - rpm_run(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + rpm_run(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ') optional_policy(` @@ -262,8 +262,8 @@ ') optional_policy(` - samba_run_net(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) - samba_run_winbind_helper(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + samba_run_net(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) + samba_run_winbind_helper(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ') optional_policy(` @@ -271,8 +271,8 @@ ') optional_policy(` - seutil_run_setfiles(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) - seutil_run_runinit(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + seutil_run_setfiles(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) + seutil_run_runinit(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ') optional_policy(` @@ -280,15 +280,15 @@ ') optional_policy(` - sysnet_run_ifconfig(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) - sysnet_run_dhcpc(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + sysnet_run_ifconfig(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) + sysnet_run_dhcpc(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ') optional_policy(` - tripwire_run_siggen(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) - tripwire_run_tripwire(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) - tripwire_run_twadmin(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) - tripwire_run_twprint(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + tripwire_run_siggen(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) + tripwire_run_tripwire(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) + tripwire_run_twadmin(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) + tripwire_run_twprint(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ') optional_policy(` @@ -308,23 +308,23 @@ ') optional_policy(` - usbmodules_run(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + usbmodules_run(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ') optional_policy(` - usermanage_run_admin_passwd(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) - usermanage_run_groupadd(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) - usermanage_run_useradd(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + usermanage_run_admin_passwd(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) + usermanage_run_groupadd(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) + usermanage_run_useradd(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ') optional_policy(` - vpn_run(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + vpn_run(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ') optional_policy(` - webalizer_run(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + webalizer_run(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ') optional_policy(` - yam_run(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) + yam_run(sysadm_t,sysadm_r,{ sysadm_tty_device_t sysadm_devpts_t }) ') Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/roles/staff.te =================================================================== --- /home/domg472/Workspace/refpolicy_trunk/policy/modules/roles/staff.te (revision 2758) +++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/roles/staff.te (working copy) @@ -1,5 +1,5 @@ -policy_module(staff, 1.0.0) +policy_module(staff,1.0.0) ######################################## #
Attachment:
signature.asc
Description: This is a digitally signed message part