rpms/selinux-policy
7
0
Fork 0
Code Issues Pull Requests Releases Activity

convert over optional policy to optional_policy macro

Browse Source
This commit is contained in:
Chris PeBenito 2005-04-28 15:48:27 +00:00
parent 55a46da18a
commit 3009816bcd
3 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
refpolicy/policy/modules/kernel/bootloader.te
View File

@ -140,7 +140,7 @@ allow bootloader_t bootloader_tmp_t:lnk_file { create read getattr setattr unlin
# for tune2fs (cjp: ?) # for tune2fs (cjp: ?)
files_create_private_root_dir_entry(bootloader_t,bootloader_tmp_t) files_create_private_root_dir_entry(bootloader_t,bootloader_tmp_t)
ifdef(`fsadm.te', ` optional_policy(`fsadm.te', `
filesystemtools_execute(bootloader_t) filesystemtools_execute(bootloader_t)
') ')

14
refpolicy/policy/modules/system/init.te
View File

@ -140,22 +140,10 @@ allow init_t self:capability ~sys_module;
# Modify utmp. # Modify utmp.
allow init_t initrc_var_run_t:file { getattr read write setattr }; allow init_t initrc_var_run_t:file { getattr read write setattr };
define(`init_consoletype_optional_policy',` optional_policy(`consoletype.te',`
consoletype_execute(init_t,optional) consoletype_execute(init_t,optional)
') ')
########################################
#
# Conditional policy logic
#
ifdef(`monolithic_policy',`
ifdef(`consoletype.te',`init_consoletype_optional_policy')
',`
optional consoletype { consoletype_execute_depend }
ifopt (consoletype) { init_consoletype_optional_policy }
') dnl end monolithic_policy
######################################## ########################################
# #
# the following still need to be converted over # the following still need to be converted over

2
refpolicy/policy/modules/system/logging.te
View File

@ -153,7 +153,7 @@ kernel_clear_ring_buffer(syslogd_t)
kernel_change_ring_buffer_level(syslogd_t) kernel_change_ring_buffer_level(syslogd_t)
') ')
ifdef(`udev.te', ` optional_policy(`udev.te', `
udev_read_database(syslogd_t) udev_read_database(syslogd_t)
')dnl end if udev.te ')dnl end if udev.te