This patch aims to remove any duplicate delimiter. -- Dominick Grift <domg472@xxxxxxxxx>
Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/kernel/devices.if
===================================================================
--- /home/domg472/Workspace/refpolicy_trunk/policy/modules/kernel/devices.if (revision 2758)
+++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/kernel/devices.if (working copy)
@@ -520,7 +520,7 @@
#
interface(`dev_manage_all_dev_nodes',`
gen_require(`
- attribute device_node, memory_raw_read, memory_raw_write;
+ attribute device_node,memory_raw_read,memory_raw_write;
type device_t;
')
@@ -924,12 +924,12 @@
#
interface(`dev_manage_all_chr_files',`
gen_require(`
- attribute device_node, memory_raw_read, memory_raw_write;
+ attribute device_node,memory_raw_read,memory_raw_write;
')
manage_chr_files_pattern($1,device_t,device_node)
- typeattribute $1 memory_raw_read, memory_raw_write;
+ typeattribute $1 memory_raw_read,memory_raw_write;
')
########################################
@@ -944,7 +944,7 @@
#
interface(`dev_getattr_agp_dev',`
gen_require(`
- type device_t, agp_device_t;
+ type device_t,agp_device_t;
')
getattr_chr_files_pattern($1,device_t,agp_device_t)
@@ -962,7 +962,7 @@
#
interface(`dev_rw_agp',`
gen_require(`
- type device_t, agp_device_t;
+ type device_t,agp_device_t;
')
rw_chr_files_pattern($1,device_t,agp_device_t)
@@ -980,7 +980,7 @@
#
interface(`dev_getattr_apm_bios_dev',`
gen_require(`
- type device_t, apm_bios_t;
+ type device_t,apm_bios_t;
')
getattr_chr_files_pattern($1,device_t,apm_bios_t)
@@ -1017,7 +1017,7 @@
#
interface(`dev_setattr_apm_bios_dev',`
gen_require(`
- type device_t, apm_bios_t;
+ type device_t,apm_bios_t;
')
setattr_chr_files_pattern($1,device_t,apm_bios_t)
@@ -1054,7 +1054,7 @@
#
interface(`dev_rw_apm_bios',`
gen_require(`
- type device_t, apm_bios_t;
+ type device_t,apm_bios_t;
')
rw_chr_files_pattern($1,device_t,apm_bios_t)
@@ -1110,7 +1110,7 @@
#
interface(`dev_manage_cardmgr_dev',`
gen_require(`
- type device_t, cardmgr_dev_t;
+ type device_t,cardmgr_dev_t;
')
manage_chr_files_pattern($1,device_t,cardmgr_dev_t)
@@ -1131,7 +1131,7 @@
#
interface(`dev_create_cardmgr_dev',`
gen_require(`
- type device_t, cardmgr_dev_t;
+ type device_t,cardmgr_dev_t;
')
create_chr_files_pattern($1,device_t,cardmgr_dev_t)
@@ -1152,7 +1152,7 @@
#
interface(`dev_getattr_cpu_dev',`
gen_require(`
- type device_t, cpu_device_t;
+ type device_t,cpu_device_t;
')
getattr_chr_files_pattern($1,device_t,cpu_device_t)
@@ -1170,7 +1170,7 @@
#
interface(`dev_read_cpuid',`
gen_require(`
- type device_t, cpu_device_t;
+ type device_t,cpu_device_t;
')
read_chr_files_pattern($1,device_t,cpu_device_t)
@@ -1189,7 +1189,7 @@
#
interface(`dev_rw_cpu_microcode',`
gen_require(`
- type device_t, cpu_device_t;
+ type device_t,cpu_device_t;
')
rw_chr_files_pattern($1,device_t,cpu_device_t)
@@ -1207,7 +1207,7 @@
#
interface(`dev_rw_crypto',`
gen_require(`
- type device_t, crypt_device_t;
+ type device_t,crypt_device_t;
')
rw_chr_files_pattern($1,device_t,crypt_device_t)
@@ -1225,7 +1225,7 @@
#
interface(`dev_getattr_dri_dev',`
gen_require(`
- type device_t, dri_device_t;
+ type device_t,dri_device_t;
')
getattr_chr_files_pattern($1,device_t,dri_device_t)
@@ -1243,7 +1243,7 @@
#
interface(`dev_setattr_dri_dev',`
gen_require(`
- type device_t, dri_device_t;
+ type device_t,dri_device_t;
')
setattr_chr_files_pattern($1,device_t,dri_device_t)
@@ -1261,7 +1261,7 @@
#
interface(`dev_rw_dri',`
gen_require(`
- type device_t, dri_device_t;
+ type device_t,dri_device_t;
')
rw_chr_files_pattern($1,device_t,dri_device_t)
@@ -1297,7 +1297,7 @@
#
interface(`dev_manage_dri_dev',`
gen_require(`
- type device_t, dri_device_t;
+ type device_t,dri_device_t;
')
manage_chr_files_pattern($1,device_t,dri_device_t)
@@ -1316,7 +1316,7 @@
#
interface(`dev_getattr_input_dev',`
gen_require(`
- type device_t, event_device_t;
+ type device_t,event_device_t;
')
allow $1 device_t:dir list_dir_perms;
@@ -1335,7 +1335,7 @@
#
interface(`dev_setattr_input_dev',`
gen_require(`
- type device_t, event_device_t;
+ type device_t,event_device_t;
')
allow $1 device_t:dir list_dir_perms;
@@ -1354,7 +1354,7 @@
#
interface(`dev_read_input',`
gen_require(`
- type device_t, event_device_t;
+ type device_t,event_device_t;
')
read_chr_files_pattern($1,device_t,event_device_t)
@@ -1372,7 +1372,7 @@
#
interface(`dev_rw_input_dev',`
gen_require(`
- type device_t, event_device_t;
+ type device_t,event_device_t;
')
rw_chr_files_pattern($1,device_t,event_device_t)
@@ -1390,7 +1390,7 @@
#
interface(`dev_getattr_framebuffer_dev',`
gen_require(`
- type device_t, framebuf_device_t;
+ type device_t,framebuf_device_t;
')
getattr_chr_files_pattern($1,device_t,framebuf_device_t)
@@ -1408,7 +1408,7 @@
#
interface(`dev_setattr_framebuffer_dev',`
gen_require(`
- type device_t, framebuf_device_t;
+ type device_t,framebuf_device_t;
')
setattr_chr_files_pattern($1,device_t,framebuf_device_t)
@@ -1481,7 +1481,7 @@
#
interface(`dev_write_framebuffer',`
gen_require(`
- type device_t, framebuf_device_t;
+ type device_t,framebuf_device_t;
')
write_chr_files_pattern($1,device_t,framebuf_device_t)
@@ -1499,7 +1499,7 @@
#
interface(`dev_rw_framebuffer',`
gen_require(`
- type device_t, framebuf_device_t;
+ type device_t,framebuf_device_t;
')
rw_chr_files_pattern($1,device_t,framebuf_device_t)
@@ -1517,7 +1517,7 @@
#
interface(`dev_read_lvm_control',`
gen_require(`
- type device_t, lvm_control_t;
+ type device_t,lvm_control_t;
')
read_chr_files_pattern($1,device_t,lvm_control_t)
@@ -1535,7 +1535,7 @@
#
interface(`dev_rw_lvm_control',`
gen_require(`
- type device_t, lvm_control_t;
+ type device_t,lvm_control_t;
')
rw_chr_files_pattern($1,device_t,lvm_control_t)
@@ -1553,7 +1553,7 @@
#
interface(`dev_delete_lvm_control_dev',`
gen_require(`
- type device_t, lvm_control_t;
+ type device_t,lvm_control_t;
')
delete_chr_files_pattern($1,device_t,lvm_control_t)
@@ -1589,7 +1589,7 @@
#
interface(`dev_read_raw_memory',`
gen_require(`
- type device_t, memory_device_t;
+ type device_t,memory_device_t;
attribute memory_raw_read;
')
@@ -1611,7 +1611,7 @@
#
interface(`dev_write_raw_memory',`
gen_require(`
- type device_t, memory_device_t;
+ type device_t,memory_device_t;
attribute memory_raw_write;
')
@@ -1633,7 +1633,7 @@
#
interface(`dev_rx_raw_memory',`
gen_require(`
- type device_t, memory_device_t;
+ type device_t,memory_device_t;
')
dev_read_raw_memory($1)
@@ -1652,7 +1652,7 @@
#
interface(`dev_wx_raw_memory',`
gen_require(`
- type device_t, memory_device_t;
+ type device_t,memory_device_t;
')
dev_write_raw_memory($1)
@@ -1671,7 +1671,7 @@
#
interface(`dev_getattr_misc_dev',`
gen_require(`
- type device_t, misc_device_t;
+ type device_t,misc_device_t;
')
getattr_chr_files_pattern($1,device_t,misc_device_t)
@@ -1708,7 +1708,7 @@
#
interface(`dev_setattr_misc_dev',`
gen_require(`
- type device_t, misc_device_t;
+ type device_t,misc_device_t;
')
setattr_chr_files_pattern($1,device_t,misc_device_t)
@@ -1745,7 +1745,7 @@
#
interface(`dev_read_misc',`
gen_require(`
- type device_t, misc_device_t;
+ type device_t,misc_device_t;
')
read_chr_files_pattern($1,device_t,misc_device_t)
@@ -1763,7 +1763,7 @@
#
interface(`dev_write_misc',`
gen_require(`
- type device_t, misc_device_t;
+ type device_t,misc_device_t;
')
write_chr_files_pattern($1,device_t,misc_device_t)
@@ -1799,7 +1799,7 @@
#
interface(`dev_getattr_mouse_dev',`
gen_require(`
- type device_t, mouse_device_t;
+ type device_t,mouse_device_t;
')
getattr_chr_files_pattern($1,device_t,mouse_device_t)
@@ -1817,7 +1817,7 @@
#
interface(`dev_setattr_mouse_dev',`
gen_require(`
- type device_t, mouse_device_t;
+ type device_t,mouse_device_t;
')
setattr_chr_files_pattern($1,device_t,mouse_device_t)
@@ -1835,7 +1835,7 @@
#
interface(`dev_read_mouse',`
gen_require(`
- type device_t, mouse_device_t;
+ type device_t,mouse_device_t;
')
read_chr_files_pattern($1,device_t,mouse_device_t)
@@ -1853,7 +1853,7 @@
#
interface(`dev_rw_mouse',`
gen_require(`
- type device_t, mouse_device_t;
+ type device_t,mouse_device_t;
')
rw_chr_files_pattern($1,device_t,mouse_device_t)
@@ -1872,7 +1872,7 @@
#
interface(`dev_getattr_mtrr_dev',`
gen_require(`
- type device_t, mtrr_device_t;
+ type device_t,mtrr_device_t;
')
getattr_files_pattern($1,device_t,mtrr_device_t)
@@ -1949,7 +1949,7 @@
#
interface(`dev_rw_mtrr',`
gen_require(`
- type device_t, mtrr_device_t;
+ type device_t,mtrr_device_t;
')
rw_files_pattern($1,device_t,mtrr_device_t)
@@ -1968,7 +1968,7 @@
#
interface(`dev_rw_null',`
gen_require(`
- type device_t, null_device_t;
+ type device_t,null_device_t;
')
rw_chr_files_pattern($1,device_t,null_device_t)
@@ -1986,7 +1986,7 @@
#
interface(`dev_create_null_dev',`
gen_require(`
- type device_t, null_device_t;
+ type device_t,null_device_t;
')
create_chr_files_pattern($1,device_t,null_device_t)
@@ -2041,7 +2041,7 @@
#
interface(`dev_getattr_printer_dev',`
gen_require(`
- type device_t, printer_device_t;
+ type device_t,printer_device_t;
')
getattr_chr_files_pattern($1,device_t,printer_device_t)
@@ -2059,7 +2059,7 @@
#
interface(`dev_setattr_printer_dev',`
gen_require(`
- type device_t, printer_device_t;
+ type device_t,printer_device_t;
')
setattr_chr_files_pattern($1,device_t,printer_device_t)
@@ -2078,7 +2078,7 @@
# cjp: added for lpd/checkpc_t
interface(`dev_append_printer',`
gen_require(`
- type device_t, printer_device_t;
+ type device_t,printer_device_t;
')
append_chr_files_pattern($1,device_t,printer_device_t)
@@ -2096,7 +2096,7 @@
#
interface(`dev_rw_printer',`
gen_require(`
- type device_t, printer_device_t;
+ type device_t,printer_device_t;
')
rw_chr_files_pattern($1,device_t,printer_device_t)
@@ -2115,7 +2115,7 @@
#
interface(`dev_read_rand',`
gen_require(`
- type device_t, random_device_t;
+ type device_t,random_device_t;
')
read_chr_files_pattern($1,device_t,random_device_t)
@@ -2154,7 +2154,7 @@
#
interface(`dev_write_rand',`
gen_require(`
- type device_t, random_device_t;
+ type device_t,random_device_t;
')
write_chr_files_pattern($1,device_t,random_device_t)
@@ -2172,7 +2172,7 @@
#
interface(`dev_read_realtime_clock',`
gen_require(`
- type device_t, clock_device_t;
+ type device_t,clock_device_t;
')
read_chr_files_pattern($1,device_t,clock_device_t)
@@ -2190,7 +2190,7 @@
#
interface(`dev_write_realtime_clock',`
gen_require(`
- type device_t, clock_device_t;
+ type device_t,clock_device_t;
')
write_chr_files_pattern($1,device_t,clock_device_t)
@@ -2225,7 +2225,7 @@
#
interface(`dev_getattr_scanner_dev',`
gen_require(`
- type device_t, scanner_device_t;
+ type device_t,scanner_device_t;
')
getattr_chr_files_pattern($1,device_t,scanner_device_t)
@@ -2262,7 +2262,7 @@
#
interface(`dev_setattr_scanner_dev',`
gen_require(`
- type device_t, scanner_device_t;
+ type device_t,scanner_device_t;
')
setattr_chr_files_pattern($1,device_t,scanner_device_t)
@@ -2299,7 +2299,7 @@
#
interface(`dev_rw_scanner',`
gen_require(`
- type device_t, scanner_device_t;
+ type device_t,scanner_device_t;
')
rw_chr_files_pattern($1,device_t,scanner_device_t)
@@ -2317,7 +2317,7 @@
#
interface(`dev_getattr_sound_dev',`
gen_require(`
- type device_t, sound_device_t;
+ type device_t,sound_device_t;
')
getattr_chr_files_pattern($1,device_t,sound_device_t)
@@ -2335,7 +2335,7 @@
#
interface(`dev_setattr_sound_dev',`
gen_require(`
- type device_t, sound_device_t;
+ type device_t,sound_device_t;
')
setattr_chr_files_pattern($1,device_t,sound_device_t)
@@ -2353,7 +2353,7 @@
#
interface(`dev_read_sound',`
gen_require(`
- type device_t, sound_device_t;
+ type device_t,sound_device_t;
')
read_chr_files_pattern($1,device_t,sound_device_t)
@@ -2371,7 +2371,7 @@
#
interface(`dev_write_sound',`
gen_require(`
- type device_t, sound_device_t;
+ type device_t,sound_device_t;
')
write_chr_files_pattern($1,device_t,sound_device_t)
@@ -2389,7 +2389,7 @@
#
interface(`dev_read_sound_mixer',`
gen_require(`
- type device_t, sound_device_t;
+ type device_t,sound_device_t;
')
read_chr_files_pattern($1,device_t,sound_device_t)
@@ -2407,7 +2407,7 @@
#
interface(`dev_write_sound_mixer',`
gen_require(`
- type device_t, sound_device_t;
+ type device_t,sound_device_t;
')
write_chr_files_pattern($1,device_t,sound_device_t)
@@ -2425,7 +2425,7 @@
#
interface(`dev_getattr_power_mgmt_dev',`
gen_require(`
- type device_t, power_device_t;
+ type device_t,power_device_t;
')
getattr_chr_files_pattern($1,device_t,power_device_t)
@@ -2443,7 +2443,7 @@
#
interface(`dev_setattr_power_mgmt_dev',`
gen_require(`
- type device_t, power_device_t;
+ type device_t,power_device_t;
')
setattr_chr_files_pattern($1,device_t,power_device_t)
@@ -2461,7 +2461,7 @@
#
interface(`dev_rw_power_management',`
gen_require(`
- type device_t, power_device_t;
+ type device_t,power_device_t;
')
rw_chr_files_pattern($1,device_t,power_device_t)
@@ -2517,7 +2517,7 @@
#
interface(`dev_rw_smartcard',`
gen_require(`
- type device_t, smartcard_device_t;
+ type device_t,smartcard_device_t;
')
rw_chr_files_pattern($1,device_t,smartcard_device_t)
@@ -2535,7 +2535,7 @@
#
interface(`dev_manage_smartcard',`
gen_require(`
- type device_t, smartcard_device_t;
+ type device_t,smartcard_device_t;
')
manage_chr_files_pattern($1,device_t,smartcard_device_t)
@@ -2687,7 +2687,7 @@
#
interface(`dev_read_urand',`
gen_require(`
- type device_t, urandom_device_t;
+ type device_t,urandom_device_t;
')
read_chr_files_pattern($1,device_t,urandom_device_t)
@@ -2725,7 +2725,7 @@
#
interface(`dev_write_urand',`
gen_require(`
- type device_t, urandom_device_t;
+ type device_t,urandom_device_t;
')
write_chr_files_pattern($1,device_t,urandom_device_t)
@@ -2969,7 +2969,7 @@
#
interface(`dev_getattr_video_dev',`
gen_require(`
- type device_t, v4l_device_t;
+ type device_t,v4l_device_t;
')
getattr_chr_files_pattern($1,device_t,v4l_device_t)
@@ -3006,7 +3006,7 @@
#
interface(`dev_setattr_video_dev',`
gen_require(`
- type device_t, v4l_device_t;
+ type device_t,v4l_device_t;
')
setattr_chr_files_pattern($1,device_t,v4l_device_t)
@@ -3043,7 +3043,7 @@
#
interface(`dev_read_video_dev',`
gen_require(`
- type device_t, v4l_device_t;
+ type device_t,v4l_device_t;
')
read_chr_files_pattern($1,device_t,v4l_device_t)
@@ -3061,7 +3061,7 @@
#
interface(`dev_write_video_dev',`
gen_require(`
- type device_t, v4l_device_t;
+ type device_t,v4l_device_t;
')
write_chr_files_pattern($1,device_t,v4l_device_t)
@@ -3079,7 +3079,7 @@
#
interface(`dev_rw_vmware',`
gen_require(`
- type device_t, vmware_device_t;
+ type device_t,vmware_device_t;
')
rw_chr_files_pattern($1,device_t,vmware_device_t)
@@ -3097,7 +3097,7 @@
#
interface(`dev_rwx_vmware',`
gen_require(`
- type device_t, vmware_device_t;
+ type device_t,vmware_device_t;
')
dev_rw_vmware($1)
@@ -3116,7 +3116,7 @@
#
interface(`dev_write_watchdog',`
gen_require(`
- type device_t, watchdog_device_t;
+ type device_t,watchdog_device_t;
')
write_chr_files_pattern($1,device_t,watchdog_device_t)
@@ -3134,7 +3134,7 @@
#
interface(`dev_rw_xen',`
gen_require(`
- type device_t, xen_device_t;
+ type device_t,xen_device_t;
')
rw_chr_files_pattern($1,device_t,xen_device_t)
@@ -3152,7 +3152,7 @@
#
interface(`dev_manage_xen',`
gen_require(`
- type device_t, xen_device_t;
+ type device_t,xen_device_t;
')
manage_chr_files_pattern($1,device_t,xen_device_t)
@@ -3171,7 +3171,7 @@
#
interface(`dev_filetrans_xen',`
gen_require(`
- type device_t, xen_device_t;
+ type device_t,xen_device_t;
')
filetrans_pattern($1,device_t,xen_device_t,chr_file)
@@ -3189,7 +3189,7 @@
#
interface(`dev_getattr_xserver_misc_dev',`
gen_require(`
- type device_t, xserver_misc_device_t;
+ type device_t,xserver_misc_device_t;
')
getattr_chr_files_pattern($1,device_t,xserver_misc_device_t)
@@ -3207,7 +3207,7 @@
#
interface(`dev_setattr_xserver_misc_dev',`
gen_require(`
- type device_t, xserver_misc_device_t;
+ type device_t,xserver_misc_device_t;
')
setattr_chr_files_pattern($1,device_t,xserver_misc_device_t)
@@ -3225,7 +3225,7 @@
#
interface(`dev_rw_xserver_misc',`
gen_require(`
- type device_t, xserver_misc_device_t;
+ type device_t,xserver_misc_device_t;
')
rw_chr_files_pattern($1,device_t,xserver_misc_device_t)
@@ -3243,7 +3243,7 @@
#
interface(`dev_rw_zero',`
gen_require(`
- type device_t, zero_device_t;
+ type device_t,zero_device_t;
')
rw_chr_files_pattern($1,device_t,zero_device_t)
@@ -3299,7 +3299,7 @@
#
interface(`dev_create_zero_dev',`
gen_require(`
- type device_t, zero_device_t;
+ type device_t,zero_device_t;
')
create_chr_files_pattern($1,device_t,zero_device_t)
Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/kernel/files.if
===================================================================
--- /home/domg472/Workspace/refpolicy_trunk/policy/modules/kernel/files.if (revision 2758)
+++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/kernel/files.if (working copy)
@@ -316,7 +316,7 @@
#
interface(`files_list_non_security',`
gen_require(`
- attribute file_type, security_file_type;
+ attribute file_type,security_file_type;
')
list_dirs_pattern($1,{ file_type -security_file_type },{ file_type -security_file_type })
@@ -335,7 +335,7 @@
#
interface(`files_dontaudit_list_non_security',`
gen_require(`
- attribute file_type, security_file_type;
+ attribute file_type,security_file_type;
')
dontaudit $1 { file_type -security_file_type }:dir list_dir_perms;
@@ -354,7 +354,7 @@
#
interface(`files_mounton_non_security',`
gen_require(`
- attribute file_type, security_file_type;
+ attribute file_type,security_file_type;
')
allow $1 { file_type -security_file_type }:dir mounton;
@@ -373,7 +373,7 @@
#
interface(`files_write_non_security_dirs',`
gen_require(`
- attribute file_type, security_file_type;
+ attribute file_type,security_file_type;
')
allow $1 { file_type -security_file_type }:dir write;
@@ -430,7 +430,7 @@
#
interface(`files_dontaudit_getattr_non_security_files',`
gen_require(`
- attribute file_type, security_file_type;
+ attribute file_type,security_file_type;
')
dontaudit $1 { file_type -security_file_type }:file getattr;
@@ -498,7 +498,7 @@
#
interface(`files_read_non_security_files',`
gen_require(`
- attribute file_type, security_file_type;
+ attribute file_type,security_file_type;
')
read_files_pattern($1,{ file_type -security_file_type },{ file_type -security_file_type })
@@ -648,7 +648,7 @@
#
interface(`files_dontaudit_getattr_non_security_symlinks',`
gen_require(`
- attribute file_type, security_file_type;
+ attribute file_type,security_file_type;
')
dontaudit $1 { file_type -security_file_type }:lnk_file getattr;
@@ -667,7 +667,7 @@
#
interface(`files_dontaudit_getattr_non_security_blk_files',`
gen_require(`
- attribute file_type, security_file_type;
+ attribute file_type,security_file_type;
')
dontaudit $1 { file_type -security_file_type }:blk_file getattr;
@@ -686,7 +686,7 @@
#
interface(`files_dontaudit_getattr_non_security_chr_files',`
gen_require(`
- attribute file_type, security_file_type;
+ attribute file_type,security_file_type;
')
dontaudit $1 { file_type -security_file_type }:chr_file getattr;
@@ -763,7 +763,7 @@
#
interface(`files_dontaudit_getattr_non_security_pipes',`
gen_require(`
- attribute file_type, security_file_type;
+ attribute file_type,security_file_type;
')
dontaudit $1 { file_type -security_file_type }:fifo_file getattr;
@@ -820,7 +820,7 @@
#
interface(`files_dontaudit_getattr_non_security_sockets',`
gen_require(`
- attribute file_type, security_file_type;
+ attribute file_type,security_file_type;
')
dontaudit $1 { file_type -security_file_type }:sock_file getattr;
@@ -2051,7 +2051,7 @@
#
interface(`files_create_boot_flag',`
gen_require(`
- type root_t, etc_runtime_t;
+ type root_t,etc_runtime_t;
')
allow $1 etc_runtime_t:file manage_file_perms;
@@ -2072,7 +2072,7 @@
#
interface(`files_read_etc_runtime_files',`
gen_require(`
- type etc_t, etc_runtime_t;
+ type etc_t,etc_runtime_t;
')
allow $1 etc_t:dir list_dir_perms;
@@ -2114,7 +2114,7 @@
#
interface(`files_rw_etc_runtime_files',`
gen_require(`
- type etc_t, etc_runtime_t;
+ type etc_t,etc_runtime_t;
')
allow $1 etc_t:dir list_dir_perms;
@@ -2136,7 +2136,7 @@
#
interface(`files_manage_etc_runtime_files',`
gen_require(`
- type etc_t, etc_runtime_t;
+ type etc_t,etc_runtime_t;
')
manage_files_pattern($1,{ etc_t etc_runtime_t },etc_runtime_t)
@@ -2160,7 +2160,7 @@
#
interface(`files_etc_filetrans_etc_runtime',`
gen_require(`
- type etc_t, etc_runtime_t;
+ type etc_t,etc_runtime_t;
')
filetrans_pattern($1,etc_t,etc_runtime_t,$2)
@@ -3620,7 +3620,7 @@
#
interface(`files_getattr_usr_src_files',`
gen_require(`
- type usr_t, src_t;
+ type usr_t,src_t;
')
getattr_files_pattern($1,src_t,src_t)
@@ -3641,7 +3641,7 @@
#
interface(`files_read_usr_src_files',`
gen_require(`
- type usr_t, src_t;
+ type usr_t,src_t;
')
allow $1 usr_t:dir search_dir_perms;
@@ -3662,7 +3662,7 @@
#
interface(`files_exec_usr_src_files',`
gen_require(`
- type usr_t, src_t;
+ type usr_t,src_t;
')
list_dirs_pattern($1,usr_t,src_t)
@@ -3682,7 +3682,7 @@
#
interface(`files_create_kernel_symbol_table',`
gen_require(`
- type boot_t, system_map_t;
+ type boot_t,system_map_t;
')
allow $1 boot_t:dir { list_dir_perms add_entry_dir_perms };
@@ -3701,7 +3701,7 @@
#
interface(`files_read_kernel_symbol_table',`
gen_require(`
- type boot_t, system_map_t;
+ type boot_t,system_map_t;
')
allow $1 boot_t:dir list_dir_perms;
@@ -3720,7 +3720,7 @@
#
interface(`files_delete_kernel_symbol_table',`
gen_require(`
- type boot_t, system_map_t;
+ type boot_t,system_map_t;
')
allow $1 boot_t:dir list_dir_perms;
@@ -3968,7 +3968,7 @@
#
interface(`files_getattr_var_lib_dirs',`
gen_require(`
- type var_t, var_lib_t;
+ type var_t,var_lib_t;
')
getattr_dirs_pattern($1,var_t,var_lib_t)
@@ -3986,7 +3986,7 @@
#
interface(`files_search_var_lib',`
gen_require(`
- type var_t, var_lib_t;
+ type var_t,var_lib_t;
')
search_dirs_pattern($1,var_t,var_lib_t)
@@ -4004,7 +4004,7 @@
#
interface(`files_list_var_lib',`
gen_require(`
- type var_t, var_lib_t;
+ type var_t,var_lib_t;
')
list_dirs_pattern($1,var_t,var_lib_t)
@@ -4032,7 +4032,7 @@
#
interface(`files_var_lib_filetrans',`
gen_require(`
- type var_t, var_lib_t;
+ type var_t,var_lib_t;
')
allow $1 var_t:dir search_dir_perms;
@@ -4051,7 +4051,7 @@
#
interface(`files_read_var_lib_files',`
gen_require(`
- type var_t, var_lib_t;
+ type var_t,var_lib_t;
')
allow $1 var_lib_t:dir list_dir_perms;
@@ -4070,7 +4070,7 @@
#
interface(`files_read_var_lib_symlinks',`
gen_require(`
- type var_t, var_lib_t;
+ type var_t,var_lib_t;
')
read_lnk_files_pattern($1,{ var_t var_lib_t },var_lib_t)
@@ -4092,7 +4092,7 @@
#
interface(`files_manage_urandom_seed',`
gen_require(`
- type var_t, var_lib_t;
+ type var_t,var_lib_t;
')
allow $1 var_t:dir search_dir_perms;
@@ -4112,7 +4112,7 @@
#
interface(`files_manage_mounttab',`
gen_require(`
- type var_t, var_lib_t;
+ type var_t,var_lib_t;
')
allow $1 var_t:dir search_dir_perms;
@@ -4131,7 +4131,7 @@
#
interface(`files_search_locks',`
gen_require(`
- type var_t, var_lock_t;
+ type var_t,var_lock_t;
')
search_dirs_pattern($1,var_t,var_lock_t)
@@ -4169,7 +4169,7 @@
#
interface(`files_rw_lock_dirs',`
gen_require(`
- type var_t, var_lock_t;
+ type var_t,var_lock_t;
')
rw_dirs_pattern($1,var_t,var_lock_t)
@@ -4187,7 +4187,7 @@
#
interface(`files_getattr_generic_locks',`
gen_require(`
- type var_t, var_lock_t;
+ type var_t,var_lock_t;
')
allow $1 var_t:dir search_dir_perms;
@@ -4208,7 +4208,7 @@
#
interface(`files_manage_generic_locks',`
gen_require(`
- type var_t, var_lock_t;
+ type var_t,var_lock_t;
')
allow $1 var_t:dir search_dir_perms;
@@ -4249,7 +4249,7 @@
interface(`files_read_all_locks',`
gen_require(`
attribute lockfile;
- type var_t, var_lock_t;
+ type var_t,var_lock_t;
')
allow $1 { var_t var_lock_t }:dir search_dir_perms;
@@ -4320,7 +4320,7 @@
#
interface(`files_search_pids',`
gen_require(`
- type var_t, var_run_t;
+ type var_t,var_run_t;
')
search_dirs_pattern($1,var_t,var_run_t)
@@ -4358,7 +4358,7 @@
#
interface(`files_list_pids',`
gen_require(`
- type var_t, var_run_t;
+ type var_t,var_run_t;
')
list_dirs_pattern($1,var_t,var_run_t)
@@ -4387,7 +4387,7 @@
#
interface(`files_pid_filetrans',`
gen_require(`
- type var_t, var_run_t;
+ type var_t,var_run_t;
')
allow $1 var_t:dir search_dir_perms;
@@ -4406,7 +4406,7 @@
#
interface(`files_rw_generic_pids',`
gen_require(`
- type var_t, var_run_t;
+ type var_t,var_run_t;
')
list_dirs_pattern($1,var_t,var_run_t)
@@ -4503,7 +4503,7 @@
interface(`files_delete_all_pids',`
gen_require(`
attribute pidfile;
- type var_t, var_run_t;
+ type var_t,var_run_t;
')
allow $1 var_t:dir search_dir_perms;
@@ -4547,7 +4547,7 @@
#
interface(`files_search_spool',`
gen_require(`
- type var_t, var_spool_t;
+ type var_t,var_spool_t;
')
search_dirs_pattern($1,var_t,var_spool_t)
@@ -4585,7 +4585,7 @@
#
interface(`files_list_spool',`
gen_require(`
- type var_t, var_spool_t;
+ type var_t,var_spool_t;
')
list_dirs_pattern($1,var_t,var_spool_t)
@@ -4604,7 +4604,7 @@
#
interface(`files_manage_generic_spool_dirs',`
gen_require(`
- type var_t, var_spool_t;
+ type var_t,var_spool_t;
')
allow $1 var_t:dir search_dir_perms;
@@ -4623,7 +4623,7 @@
#
interface(`files_read_generic_spool',`
gen_require(`
- type var_t, var_spool_t;
+ type var_t,var_spool_t;
')
list_dirs_pattern($1,var_t,var_spool_t)
@@ -4643,7 +4643,7 @@
#
interface(`files_manage_generic_spool',`
gen_require(`
- type var_t, var_spool_t;
+ type var_t,var_spool_t;
')
allow $1 var_t:dir search_dir_perms;
@@ -4674,7 +4674,7 @@
#
interface(`files_spool_filetrans',`
gen_require(`
- type var_t, var_spool_t;
+ type var_t,var_spool_t;
')
allow $1 var_t:dir search_dir_perms;
@@ -4694,7 +4694,7 @@
#
interface(`files_polyinstantiate_all',`
gen_require(`
- attribute polydir, polymember, polyparent;
+ attribute polydir,polymember,polyparent;
type poly_t;
')
@@ -4763,7 +4763,7 @@
#
interface(`files_manage_non_security_dirs',`
gen_require(`
- attribute file_type, security_file_type;
+ attribute file_type,security_file_type;
')
allow $1 { file_type -security_file_type }:dir manage_dir_perms;
Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/kernel/storage.if
===================================================================
--- /home/domg472/Workspace/refpolicy_trunk/policy/modules/kernel/storage.if (revision 2758)
+++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/kernel/storage.if (working copy)
@@ -199,14 +199,14 @@
#
interface(`storage_manage_fixed_disk',`
gen_require(`
- attribute fixed_disk_raw_read, fixed_disk_raw_write;
+ attribute fixed_disk_raw_read,fixed_disk_raw_write;
type fixed_disk_device_t;
')
dev_list_all_dev_nodes($1)
allow $1 self:capability mknod;
allow $1 fixed_disk_device_t:blk_file manage_blk_file_perms;
- typeattribute $1 fixed_disk_raw_read, fixed_disk_raw_write;
+ typeattribute $1 fixed_disk_raw_read,fixed_disk_raw_write;
')
########################################
Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/kernel/domain.if
===================================================================
--- /home/domg472/Workspace/refpolicy_trunk/policy/modules/kernel/domain.if (revision 2758)
+++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/kernel/domain.if (working copy)
@@ -619,7 +619,7 @@
#
interface(`domain_read_confined_domains_state',`
gen_require(`
- attribute domain, unconfined_domain_type;
+ attribute domain,unconfined_domain_type;
')
kernel_search_proc($1)
@@ -644,7 +644,7 @@
#
interface(`domain_getattr_confined_domains',`
gen_require(`
- attribute domain, unconfined_domain_type;
+ attribute domain,unconfined_domain_type;
')
allow $1 { domain -unconfined_domain_type }:process getattr;
@@ -720,7 +720,7 @@
#
interface(`domain_dontaudit_ptrace_confined_domains',`
gen_require(`
- attribute domain, unconfined_domain_type;
+ attribute domain,unconfined_domain_type;
')
dontaudit $1 { domain -unconfined_domain_type }:process ptrace;
Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/kernel/corecommands.te
===================================================================
--- /home/domg472/Workspace/refpolicy_trunk/policy/modules/kernel/corecommands.te (revision 2758)
+++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/kernel/corecommands.te (working copy)
@@ -1,5 +1,5 @@
-policy_module(corecommands, 1.10.0)
+policy_module(corecommands,1.10.0)
########################################
#
Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/kernel/corecommands.if
===================================================================
--- /home/domg472/Workspace/refpolicy_trunk/policy/modules/kernel/corecommands.if (revision 2758)
+++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/kernel/corecommands.if (working copy)
@@ -761,7 +761,7 @@
#
interface(`corecmd_check_exec_shell',`
gen_require(`
- type bin_t, shell_exec_t;
+ type bin_t,shell_exec_t;
')
list_dirs_pattern($1,bin_t,bin_t)
@@ -835,7 +835,7 @@
#
interface(`corecmd_shell_spec_domtrans',`
gen_require(`
- type bin_t, shell_exec_t;
+ type bin_t,shell_exec_t;
')
list_dirs_pattern($1,bin_t,bin_t)
Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/kernel/terminal.if
===================================================================
--- /home/domg472/Workspace/refpolicy_trunk/policy/modules/kernel/terminal.if (revision 2758)
+++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/kernel/terminal.if (working copy)
@@ -83,11 +83,11 @@
#
interface(`term_tty',`
gen_require(`
- attribute ttynode, serial_device;
+ attribute ttynode,serial_device;
type tty_device_t;
')
- typeattribute $1 ttynode, serial_device;
+ typeattribute $1 ttynode,serial_device;
dev_node($1)
')
@@ -141,7 +141,7 @@
#
interface(`term_create_pty',`
gen_require(`
- type bsdpty_device_t, devpts_t, ptmx_t;
+ type bsdpty_device_t,devpts_t,ptmx_t;
')
dev_list_all_dev_nodes($1)
@@ -167,8 +167,8 @@
#
interface(`term_use_all_terms',`
gen_require(`
- attribute ttynode, ptynode;
- type console_device_t, devpts_t, tty_device_t;
+ attribute ttynode,ptynode;
+ type console_device_t,devpts_t,tty_device_t;
')
dev_list_all_dev_nodes($1)
Index: /home/domg472/Workspace/refpolicy_trunk/policy/modules/kernel/kernel.if
===================================================================
--- /home/domg472/Workspace/refpolicy_trunk/policy/modules/kernel/kernel.if (revision 2758)
+++ /home/domg472/Workspace/refpolicy_trunk/policy/modules/kernel/kernel.if (working copy)
@@ -27,7 +27,7 @@
type kernel_t;
')
- domtrans_pattern(kernel_t, $2, $1)
+ domtrans_pattern(kernel_t,$2,$1)
')
########################################
@@ -1252,7 +1252,7 @@
#
interface(`kernel_read_device_sysctls',`
gen_require(`
- type proc_t, sysctl_t, sysctl_dev_t;
+ type proc_t,sysctl_t,sysctl_dev_t;
')
read_files_pattern($1,{ proc_t sysctl_t sysctl_dev_t },sysctl_dev_t)
@@ -1273,7 +1273,7 @@
#
interface(`kernel_rw_device_sysctls',`
gen_require(`
- type proc_t, sysctl_t, sysctl_dev_t;
+ type proc_t,sysctl_t,sysctl_dev_t;
')
rw_files_pattern($1,{ proc_t sysctl_t sysctl_dev_t },sysctl_dev_t)
@@ -1293,7 +1293,7 @@
#
interface(`kernel_search_vm_sysctl',`
gen_require(`
- type proc_t, sysctl_t, sysctl_vm_t;
+ type proc_t,sysctl_t,sysctl_vm_t;
')
search_dirs_pattern($1,{ proc_t sysctl_t },sysctl_vm_t)
@@ -1312,7 +1312,7 @@
#
interface(`kernel_read_vm_sysctls',`
gen_require(`
- type proc_t, sysctl_t, sysctl_vm_t;
+ type proc_t,sysctl_t,sysctl_vm_t;
')
read_files_pattern($1,{ proc_t sysctl_t sysctl_vm_t },sysctl_vm_t)
@@ -1333,7 +1333,7 @@
#
interface(`kernel_rw_vm_sysctls',`
gen_require(`
- type proc_t, sysctl_t, sysctl_vm_t;
+ type proc_t,sysctl_t,sysctl_vm_t;
')
rw_files_pattern($1,{ proc_t sysctl_t sysctl_vm_t },sysctl_vm_t)
@@ -1355,7 +1355,7 @@
#
interface(`kernel_search_network_sysctl',`
gen_require(`
- type proc_t, sysctl_t, sysctl_net_t;
+ type proc_t,sysctl_t,sysctl_net_t;
')
search_dirs_pattern($1,{ proc_t sysctl_t },sysctl_net_t)
@@ -1392,7 +1392,7 @@
#
interface(`kernel_read_net_sysctls',`
gen_require(`
- type proc_t, sysctl_t, sysctl_net_t;
+ type proc_t,sysctl_t,sysctl_net_t;
')
read_files_pattern($1,{ proc_t sysctl_t sysctl_net_t },sysctl_net_t)
@@ -1413,7 +1413,7 @@
#
interface(`kernel_rw_net_sysctls',`
gen_require(`
- type proc_t, sysctl_t, sysctl_net_t;
+ type proc_t,sysctl_t,sysctl_net_t;
')
rw_files_pattern($1,{ proc_t sysctl_t sysctl_net_t },sysctl_net_t)
@@ -1435,7 +1435,7 @@
#
interface(`kernel_read_unix_sysctls',`
gen_require(`
- type proc_t, sysctl_t, sysctl_net_t, sysctl_net_unix_t;
+ type proc_t,sysctl_t,sysctl_net_t,sysctl_net_unix_t;
')
read_files_pattern($1,{ proc_t sysctl_t sysctl_net_t },sysctl_net_unix_t)
@@ -1457,7 +1457,7 @@
#
interface(`kernel_rw_unix_sysctls',`
gen_require(`
- type proc_t, sysctl_t, sysctl_net_t, sysctl_net_unix_t;
+ type proc_t,sysctl_t,sysctl_net_t,sysctl_net_unix_t;
')
rw_files_pattern($1,{ proc_t sysctl_t sysctl_net_t },sysctl_net_unix_t)
@@ -1478,7 +1478,7 @@
#
interface(`kernel_read_hotplug_sysctls',`
gen_require(`
- type proc_t, sysctl_t, sysctl_kernel_t, sysctl_hotplug_t;
+ type proc_t,sysctl_t,sysctl_kernel_t,sysctl_hotplug_t;
')
read_files_pattern($1,{ proc_t sysctl_t sysctl_kernel_t },sysctl_hotplug_t)
@@ -1499,7 +1499,7 @@
#
interface(`kernel_rw_hotplug_sysctls',`
gen_require(`
- type proc_t, sysctl_t, sysctl_kernel_t, sysctl_hotplug_t;
+ type proc_t,sysctl_t,sysctl_kernel_t,sysctl_hotplug_t;
')
rw_files_pattern($1,{ proc_t sysctl_t sysctl_kernel_t },sysctl_hotplug_t)
@@ -1520,7 +1520,7 @@
#
interface(`kernel_read_modprobe_sysctls',`
gen_require(`
- type proc_t, sysctl_t, sysctl_kernel_t, sysctl_modprobe_t;
+ type proc_t,sysctl_t,sysctl_kernel_t,sysctl_modprobe_t;
')
read_files_pattern($1,{ proc_t sysctl_t sysctl_kernel_t },sysctl_modprobe_t)
@@ -1541,7 +1541,7 @@
#
interface(`kernel_rw_modprobe_sysctls',`
gen_require(`
- type proc_t, sysctl_t, sysctl_kernel_t, sysctl_modprobe_t;
+ type proc_t,sysctl_t,sysctl_kernel_t,sysctl_modprobe_t;
')
rw_files_pattern($1,{ proc_t sysctl_t sysctl_kernel_t },sysctl_modprobe_t)
@@ -1579,7 +1579,7 @@
#
interface(`kernel_read_kernel_sysctls',`
gen_require(`
- type proc_t, sysctl_t, sysctl_kernel_t;
+ type proc_t,sysctl_t,sysctl_kernel_t;
')
read_files_pattern($1,{ proc_t sysctl_t sysctl_kernel_t },sysctl_kernel_t)
@@ -1618,7 +1618,7 @@
#
interface(`kernel_rw_kernel_sysctl',`
gen_require(`
- type proc_t, sysctl_t, sysctl_kernel_t;
+ type proc_t,sysctl_t,sysctl_kernel_t;
')
rw_files_pattern($1,{ proc_t sysctl_t sysctl_kernel_t },sysctl_kernel_t)
@@ -1639,7 +1639,7 @@
#
interface(`kernel_read_fs_sysctls',`
gen_require(`
- type proc_t, sysctl_t, sysctl_fs_t;
+ type proc_t,sysctl_t,sysctl_fs_t;
')
read_files_pattern($1,{ proc_t sysctl_t sysctl_fs_t },sysctl_fs_t)
@@ -1660,7 +1660,7 @@
#
interface(`kernel_rw_fs_sysctls',`
gen_require(`
- type proc_t, sysctl_t, sysctl_fs_t;
+ type proc_t,sysctl_t,sysctl_fs_t;
')
rw_files_pattern($1,{ proc_t sysctl_t sysctl_fs_t },sysctl_fs_t)
@@ -1681,7 +1681,7 @@
#
interface(`kernel_read_irq_sysctls',`
gen_require(`
- type proc_t, sysctl_irq_t;
+ type proc_t,sysctl_irq_t;
')
read_files_pattern($1,{ proc_t sysctl_irq_t },sysctl_irq_t)
@@ -1702,7 +1702,7 @@
#
interface(`kernel_rw_irq_sysctls',`
gen_require(`
- type proc_t, sysctl_irq_t;
+ type proc_t,sysctl_irq_t;
')
rw_files_pattern($1,{ proc_t sysctl_irq_t },sysctl_irq_t)
@@ -1723,7 +1723,7 @@
#
interface(`kernel_read_rpc_sysctls',`
gen_require(`
- type proc_t, proc_net_t, sysctl_rpc_t;
+ type proc_t,proc_net_t,sysctl_rpc_t;
')
read_files_pattern($1,{ proc_t proc_net_t sysctl_rpc_t },sysctl_rpc_t)
@@ -1744,7 +1744,7 @@
#
interface(`kernel_rw_rpc_sysctls',`
gen_require(`
- type proc_t, proc_net_t, sysctl_rpc_t;
+ type proc_t,proc_net_t,sysctl_rpc_t;
')
rw_files_pattern($1,{ proc_t proc_net_t sysctl_rpc_t },sysctl_rpc_t)
@@ -1784,7 +1784,7 @@
interface(`kernel_read_all_sysctls',`
gen_require(`
attribute sysctl_type;
- type proc_t, proc_net_t;
+ type proc_t,proc_net_t;
')
# proc_net_t for /proc/net/rpc sysctls
@@ -1807,7 +1807,7 @@
interface(`kernel_rw_all_sysctls',`
gen_require(`
attribute sysctl_type;
- type proc_t, proc_net_t;
+ type proc_t,proc_net_t;
')
# proc_net_t for /proc/net/rpc sysctls
Attachment:
signature.asc
Description: This is a digitally signed message part
