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

move type delcarations after attribute delcarations to fix a typeattribute

Browse Source 
ordering issue. comment out the TODO types with a # so they don't get moved
This commit is contained in:
Chris PeBenito 2005-05-05 14:08:26 +00:00
parent 23af43bfef
commit f66a1af94b
4 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
refpolicy/Makefile
View File

@ -80,7 +80,7 @@ POST_TE_FILES := $(addprefix $(MISCDIR),users constraints mls initial_sid_contex
ALL_FC_FILES := $(foreach dir,$(ALL_MODULES),$(wildcard $(dir)/*.fc)) ALL_FC_FILES := $(foreach dir,$(ALL_MODULES),$(wildcard $(dir)/*.fc))
POLICY_SECTIONS := tmp/pre_te_files.conf tmp/generated_definitions.conf tmp/all_interfaces.conf tmp/all_attributes.conf tmp/only_te_rules.conf tmp/all_post.conf POLICY_SECTIONS := tmp/pre_te_files.conf tmp/generated_definitions.conf tmp/all_interfaces.conf tmp/all_attrs_types.conf tmp/only_te_rules.conf tmp/all_post.conf
override M4PARAM += -D monolithic_policy override M4PARAM += -D monolithic_policy
@ -176,11 +176,12 @@ tmp/post_te_files.conf: $(POST_TE_FILES)
# extract attributes and put them first. extract post te stuff # extract attributes and put them first. extract post te stuff
# like genfscon and put last. portcon, nodecon, and netifcon # like genfscon and put last. portcon, nodecon, and netifcon
# is delayed since they are generated by m4 # is delayed since they are generated by m4
tmp/all_attributes.conf tmp/only_te_rules.conf tmp/all_post.conf: tmp/all_te_files.conf tmp/post_te_files.conf tmp/all_attrs_types.conf tmp/only_te_rules.conf tmp/all_post.conf: tmp/all_te_files.conf tmp/post_te_files.conf
$(QUIET) grep ^attribute tmp/all_te_files.conf > tmp/all_attributes.conf || true $(QUIET) grep ^attribute tmp/all_te_files.conf > tmp/all_attrs_types.conf || true
$(QUIET) grep '^type ' tmp/all_te_files.conf >> tmp/all_attrs_types.conf
$(QUIET) cat tmp/post_te_files.conf > tmp/all_post.conf $(QUIET) cat tmp/post_te_files.conf > tmp/all_post.conf
$(QUIET) grep ^genfscon tmp/all_te_files.conf >> tmp/all_post.conf || true $(QUIET) grep ^genfscon tmp/all_te_files.conf >> tmp/all_post.conf || true
$(QUIET) sed -e /^attribute/d -e /^genfscon/d < tmp/all_te_files.conf > tmp/only_te_rules.conf $(QUIET) sed -e /^attribute/d -e '/^type /d' -e /^genfscon/d < tmp/all_te_files.conf > tmp/only_te_rules.conf
######################################## ########################################
# #

12
refpolicy/policy/modules/system/authlogin.te
View File

@ -7,8 +7,7 @@ policy_module(authlogin,1.0)
# Declarations # Declarations
# #
type chkpwd_exec_t; type chkpwd_exec_t;
authlogin_per_userdomain_template(system) files_make_file(chkpwd_exec_t)
domain_make_entrypoint_file(system_chkpwd_t,chkpwd_exec_t)
type faillog_t; type faillog_t;
logging_make_log_file(faillog_t) logging_make_log_file(faillog_t)
@ -222,6 +221,15 @@ allow pam_console_t xdm_var_run_t:file { getattr read };
allow initrc_t pam_var_console_t:dir r_dir_perms; allow initrc_t pam_var_console_t:dir r_dir_perms;
') dnl endif TODO ') dnl endif TODO
########################################
#
# System check password local policy
#
authlogin_per_userdomain_template(system)
domain_make_entrypoint_file(system_chkpwd_t,chkpwd_exec_t)
######################################## ########################################
# #
# Utempter local policy # Utempter local policy

8
refpolicy/policy/modules/system/mount.te
View File

@ -73,10 +73,10 @@ allow mount_t var_lib_nfs_t:dir mounton;
allow mount_t lib_t:file { getattr read }; allow mount_t lib_t:file { getattr read };
# TODO: Need to examine this further. Not sure how to handle this # TODO: Need to examine this further. Not sure how to handle this
type sysadm_mount_source_t, file_type, sysadmfile, $1_file_type; #type sysadm_mount_source_t, file_type, sysadmfile, $1_file_type;
allow sysadm_t sysadm_mount_source_t:file create_file_perms; #allow sysadm_t sysadm_mount_source_t:file create_file_perms;
allow sysadm_t sysadm_mount_source_t:file { relabelto relabelfrom }; #allow sysadm_t sysadm_mount_source_t:file { relabelto relabelfrom };
allow mount_t sysadm_mount_source_t:file rw_file_perms; #allow mount_t sysadm_mount_source_t:file rw_file_perms;
# TODO: Probably need a macro for reading/unlinking files # TODO: Probably need a macro for reading/unlinking files
# for when /etc/mtab loses its type # for when /etc/mtab loses its type

6
refpolicy/policy/modules/system/sysnetwork.te
View File

@ -200,9 +200,9 @@ allow ping_t cardmgr_t:fd use;
') dnl end if ping ') dnl end if ping
ifdef(`dhcpd.te', `', ` ifdef(`dhcpd.te', `', `
type dhcp_state_t, file_type, sysadmfile; #type dhcp_state_t, file_type, sysadmfile;
type dhcp_etc_t, file_type, sysadmfile, usercanread; #type dhcp_etc_t, file_type, sysadmfile, usercanread;
typealias dhcp_etc_t alias { etc_dhcp_t etc_dhcpc_t etc_dhcpd_t }; #typealias dhcp_etc_t alias { etc_dhcp_t etc_dhcpc_t etc_dhcpd_t };
') ')
allow dhcpc_t dhcp_etc_t:dir { getattr read search }; allow dhcpc_t dhcp_etc_t:dir { getattr read search };