eliminate _depend macros

This commit is contained in:
Chris PeBenito 2005-06-16 21:06:29 +00:00
parent 0e721690dc
commit a7c3a1b920

View File

@ -12,20 +12,16 @@
## </interface>
#
define(`term_pty',`
gen_require(`$0'_depend)
gen_require(`
attribute ptynode;
type devpts_t;
class filesystem associate;
')
allow $1 devpts_t:filesystem associate;
typeattribute $1 ptynode;
')
define(`term_pty_depend',`
attribute ptynode;
type devpts_t;
class filesystem associate;
')
########################################
## <interface name="term_user_pty">
## <description>
@ -43,16 +39,14 @@ define(`term_pty_depend',`
## </interface>
#
define(`term_user_pty',`
gen_require(`$0'_depend)
gen_require(`
attribute server_ptynode;
')
term_pty($1)
type_change $1 server_ptynode:chr_file $2;
')
define(`term_user_pty_depend',`
attribute server_ptynode;
')
########################################
## <interface name="term_tty">
## <description>
@ -64,7 +58,10 @@ define(`term_user_pty_depend',`
## </interface>
#
define(`term_tty',`
gen_require(`$0'_depend)
gen_require(`
attribute ttynode;
type tty_device_t;
')
typeattribute $2 ttynode;
type_change $1 tty_device_t:chr_file $2;
@ -72,7 +69,7 @@ define(`term_tty',`
# Debian login is from shadow utils and does not allow resetting the perms.
# have to fix this!
ifdef(`distro_debian',`
type_change $1 ttyfile:chr_file $2;
type_change $1 ttynode:chr_file $2;
')
ifdef(`distro_redhat',`
@ -80,12 +77,6 @@ define(`term_tty',`
')
')
define(`term_tty_depend',`
attribute ttynode;
type tty_device_t;
')
########################################
## <interface name="term_create_pty">
## <description>
@ -100,8 +91,12 @@ define(`term_tty_depend',`
## </interface>
#
define(`term_create_pty',`
gen_require(`$0'_depend)
gen_require(`
type bsdpty_device_t, devpts_t, ptmx_t;
class filesystem getattr;
class dir r_dir_perms;
class chr_file rw_file_perms;
')
dev_list_all_dev_nodes($1)
allow $1 ptmx_t:chr_file rw_file_perms;
@ -112,14 +107,6 @@ define(`term_create_pty',`
type_transition $1 devpts_t:chr_file $2;
')
define(`term_create_pty_depend',`
type ptmx_t, devpts_t;
class filesystem getattr;
class dir r_dir_perms;
class chr_file rw_file_perms;
')
########################################
## <interface name="term_use_all_terms">
## <description>
@ -132,22 +119,18 @@ define(`term_create_pty_depend',`
## </interface>
#
define(`term_use_all_terms',`
gen_require(`$0'_depend)
gen_require(`
attribute ttynode, ptynode;
type console_device_t, devpts_t, tty_device_t;
class dir r_dir_perms;
class chr_file rw_file_perms;
')
dev_list_all_dev_nodes($1)
allow $1 devpts_t:dir r_dir_perms;
allow $1 { console_device_t tty_device_t ttynode ptynode }:chr_file rw_file_perms;
')
define(`term_use_all_terms_depend',`
attribute ttynode, ptynode;
type console_device_t, devpts_t, tty_device_t;
class dir r_dir_perms;
class chr_file rw_file_perms;
')
########################################
## <interface name="term_write_console">
## <description>
@ -159,17 +142,15 @@ define(`term_use_all_terms_depend',`
## </interface>
#
define(`term_write_console',`
gen_require(`$0'_depend)
gen_require(`
type console_device_t;
class chr_file write;
')
dev_list_all_dev_nodes($1)
allow $1 console_device_t:chr_file write;
')
define(`term_use_console_depend',`
type console_device_t;
class chr_file write;
')
########################################
## <interface name="term_use_console">
## <description>
@ -181,18 +162,15 @@ define(`term_use_console_depend',`
## </interface>
#
define(`term_use_console',`
gen_require(`$0'_depend)
gen_require(`
type console_device_t;
class chr_file rw_file_perms;
')
dev_list_all_dev_nodes($1)
allow $1 console_device_t:chr_file rw_file_perms;
')
define(`term_use_console_depend',`
type console_device_t;
class chr_file rw_file_perms;
')
########################################
## <interface name="term_dontaudit_use_console">
## <description>
@ -205,17 +183,14 @@ define(`term_use_console_depend',`
## </interface>
#
define(`term_dontaudit_use_console',`
gen_require(`$0'_depend)
gen_require(`
type console_device_t;
class chr_file { read write };
')
dontaudit $1 console_device_t:chr_file { read write };
')
define(`term_dontaudit_use_console_depend',`
type console_device_t;
class chr_file { read write };
')
########################################
## <interface name="term_setattr_console">
## <description>
@ -228,18 +203,15 @@ define(`term_dontaudit_use_console_depend',`
## </interface>
#
define(`term_setattr_console',`
gen_require(`$0'_depend)
gen_require(`
type console_device_t;
class chr_file setattr;
')
dev_list_all_dev_nodes($1)
allow $1 console_device_t:chr_file setattr;
')
define(`term_setattr_console_depend',`
type console_device_t;
class chr_file setattr;
')
########################################
## <interface name="term_list_ptys">
## <description>
@ -252,18 +224,15 @@ define(`term_setattr_console_depend',`
## </interface>
#
define(`term_list_ptys',`
gen_require(`$0'_depend)
gen_require(`
type devpts_t;
class dir r_dir_perms;
')
dev_list_all_dev_nodes($1)
allow $1 devpts_t:dir r_dir_perms;
')
define(`term_list_ptys_depend',`
type devpts_t;
class dir r_dir_perms;
')
########################################
## <interface name="term_dontaudit_list_ptys">
## <description>
@ -276,17 +245,14 @@ define(`term_list_ptys_depend',`
## </interface>
#
define(`term_dontaudit_list_ptys',`
gen_require(`$0'_depend)
gen_require(`
type devpts_t;
class dir { getattr search read };
')
dontaudit $1 devpts_t:dir { getattr search read };
')
define(`term_dontaudit_list_ptys_depend',`
type devpts_t;
class dir { getattr search read };
')
########################################
## <interface name="term_use_generic_pty">
## <description>
@ -300,18 +266,15 @@ define(`term_dontaudit_list_ptys_depend',`
## </interface>
#
define(`term_use_generic_pty',`
gen_require(`$0'_depend)
gen_require(`
type devpts_t;
class chr_file { read write };
')
dev_list_all_dev_nodes($1)
allow $1 devpts_t:chr_file { read write };
')
define(`term_use_generic_pty_depend',`
type devpts_t;
class chr_file { read write };
')
########################################
## <interface name="term_dontaudit_use_generic_pty">
## <description>
@ -366,17 +329,14 @@ define(`term_use_controlling_term',`
## </interface>
#
define(`term_dontaudit_use_ptmx',`
gen_require(`$0'_depend)
gen_require(`
type ptmx_t;
class chr_file { getattr read write };
')
dontaudit $1 ptmx_t:chr_file { getattr read write };
')
define(`term_dontaudit_use_ptmx_depend',`
type ptmx_t;
class chr_file { getattr read write };
')
########################################
## <interface name="term_getattr_all_user_ptys">
## <description>
@ -389,20 +349,17 @@ define(`term_dontaudit_use_ptmx_depend',`
## </interface>
#
define(`term_getattr_all_user_ptys',`
gen_require(`$0'_depend)
gen_require(`
attribute ptynode;
class dir r_dir_perms;
class chr_file getattr;
')
dev_list_all_dev_nodes($1)
allow $1 devpts_t:dir r_dir_perms;
allow $1 ptynode:chr_file getattr;
')
define(`term_getattr_all_ptys_depend',`
attribute ptynode;
class dir r_dir_perms;
class chr_file getattr;
')
########################################
## <interface name="term_use_all_user_ptys">
## <description>
@ -414,20 +371,17 @@ define(`term_getattr_all_ptys_depend',`
## </interface>
#
define(`term_use_all_user_ptys',`
gen_require(`$0'_depend)
gen_require(`
attribute ptynode;
class dir r_dir_perms;
class chr_file { getattr read write ioctl };
')
dev_list_all_dev_nodes($1)
allow $1 devpts_t:dir r_dir_perms;
allow $1 ptynode:chr_file { getattr read write ioctl };
')
define(`term_use_all_user_ptys_depend',`
attribute ptynode;
class dir r_dir_perms;
class chr_file { getattr read write ioctl };
')
########################################
## <interface name="term_dontaudit_use_all_user_ptys">
## <description>
@ -440,17 +394,14 @@ define(`term_use_all_user_ptys_depend',`
## </interface>
#
define(`term_dontaudit_use_all_user_ptys',`
gen_require(`$0'_depend)
gen_require(`
attribute ptynode;
class chr_file { read write };
')
dontaudit $1 ptynode:chr_file { read write };
')
define(`term_dontaudit_use_all_user_ptys_depend',`
attribute ptynode;
class chr_file { read write };
')
########################################
## <interface name="term_getattr_unallocated_ttys">
## <description>
@ -463,18 +414,15 @@ define(`term_dontaudit_use_all_user_ptys_depend',`
## </interface>
#
define(`term_getattr_unallocated_ttys',`
gen_require(`$0'_depend)
gen_require(`
type tty_device_t;
class chr_file getattr;
')
dev_list_all_dev_nodes($1)
allow $1 tty_device_t:chr_file getattr;
')
define(`term_getattr_unallocated_ttys_depend',`
type tty_device_t;
class chr_file getattr;
')
########################################
## <interface name="term_setattr_unallocated_ttys">
## <description>
@ -487,18 +435,15 @@ define(`term_getattr_unallocated_ttys_depend',`
## </interface>
#
define(`term_setattr_unallocated_ttys',`
gen_require(`$0'_depend)
gen_require(`
type tty_device_t;
class chr_file setattr;
')
dev_list_all_dev_nodes($1)
allow $1 tty_device_t:chr_file setattr;
')
define(`term_setattr_unallocated_ttys_depend',`
type tty_device_t;
class chr_file setattr;
')
########################################
## <interface name="term_relabel_unallocated_ttys">
## <description>
@ -511,18 +456,15 @@ define(`term_setattr_unallocated_ttys_depend',`
## </interface>
#
define(`term_relabel_unallocated_ttys',`
gen_require(`$0'_depend)
gen_require(`
type tty_device_t;
class chr_file { relabelfrom relabelto };
')
dev_list_all_dev_nodes($1)
allow $1 tty_device_t:chr_file { relabelfrom relabelto };
')
define(`term_relabel_unallocated_ttys_depend',`
type tty_device_t;
class chr_file { relabelfrom relabelto };
')
########################################
## <interface name="term_reset_tty_labels">
## <description>
@ -535,20 +477,17 @@ define(`term_relabel_unallocated_ttys_depend',`
## </interface>
#
define(`term_reset_tty_labels',`
gen_require(`$0'_depend)
gen_require(`
attribute ttynode;
type tty_device_t;
class chr_file { relabelfrom relabelto };
')
dev_list_all_dev_nodes($1)
allow $1 ttynode:chr_file relabelfrom;
allow $1 tty_device_t:chr_file relabelto;
')
define(`term_reset_tty_labels_depend',`
attribute ttynode;
type tty_device_t;
class chr_file { relabelfrom relabelto };
')
########################################
## <interface name="term_write_unallocated_ttys">
## <description>
@ -560,18 +499,15 @@ define(`term_reset_tty_labels_depend',`
## </interface>
#
define(`term_write_unallocated_ttys',`
gen_require(`$0'_depend)
gen_require(`
type tty_device_t;
class chr_file { getattr write };
')
dev_list_all_dev_nodes($1)
allow $1 tty_device_t:chr_file { getattr write };
')
define(`term_write_unallocated_ttys_depend',`
type tty_device_t;
class chr_file { getattr write };
')
########################################
## <interface name="term_use_unallocated_tty">
## <description>
@ -583,18 +519,15 @@ define(`term_write_unallocated_ttys_depend',`
## </interface>
#
define(`term_use_unallocated_tty',`
gen_require(`$0'_depend)
gen_require(`
type tty_device_t;
class chr_file { getattr read write ioctl };
')
dev_list_all_dev_nodes($1)
allow $1 tty_device_t:chr_file { getattr read write ioctl };
')
define(`term_use_unallocated_tty_depend',`
type tty_device_t;
class chr_file { getattr read write ioctl };
')
########################################
## <interface name="term_dontaudit_use_unallocated_tty">
## <description>
@ -607,17 +540,14 @@ define(`term_use_unallocated_tty_depend',`
## </interface>
#
define(`term_dontaudit_use_unallocated_tty',`
gen_require(`$0'_depend)
gen_require(`
type tty_device_t;
class chr_file { read write };
')
dontaudit $1 tty_device_t:chr_file { read write };
')
define(`term_dontaudit_use_unallocated_tty_depend',`
type tty_device_t;
class chr_file { read write };
')
########################################
## <interface name="term_getattr_all_user_ttys">
## <description>
@ -630,18 +560,15 @@ define(`term_dontaudit_use_unallocated_tty_depend',`
## </interface>
#
define(`term_getattr_all_user_ttys',`
gen_require(`$0'_depend)
gen_require(`
attribute ttynode;
class chr_file getattr;
')
dev_list_all_dev_nodes($1)
allow $1 ttynode:chr_file getattr;
')
define(`term_getattr_all_user_ttys_depend',`
attribute ttynode;
class chr_file getattr;
')
########################################
## <interface name="term_dontaudit_getattr_all_user_ttys">
## <description>
@ -655,18 +582,15 @@ define(`term_getattr_all_user_ttys_depend',`
## </interface>
#
define(`term_dontaudit_getattr_all_user_ttys',`
gen_require(`$0'_depend)
gen_require(`
attribute ttynode;
class chr_file getattr;
')
dev_list_all_dev_nodes($1)
dontaudit $1 ttynode:chr_file getattr;
')
define(`term_dontaudit_getattr_all_user_ttys_depend',`
attribute ttynode;
class chr_file getattr;
')
########################################
## <interface name="term_setattr_all_user_ttys">
## <description>
@ -679,18 +603,15 @@ define(`term_dontaudit_getattr_all_user_ttys_depend',`
## </interface>
#
define(`term_setattr_all_user_ttys',`
gen_require(`$0'_depend)
gen_require(`
attribute ttynode;
class chr_file setattr;
')
dev_list_all_dev_nodes($1)
allow $1 ttynode:chr_file setattr;
')
define(`term_setattr_all_user_ttys_depend',`
attribute ttynode;
class chr_file setattr;
')
########################################
## <interface name="term_relabel_all_user_ttys">
## <description>
@ -703,18 +624,15 @@ define(`term_setattr_all_user_ttys_depend',`
## </interface>
#
define(`term_relabel_all_user_ttys',`
gen_require(`$0'_depend)
gen_require(`
attribute ttynode;
class chr_file { relabelfrom relabelto };
')
dev_list_all_dev_nodes($1)
allow $1 ttynode:chr_file { relabelfrom relabelto };
')
define(`term_relabel_all_user_ttys_depend',`
attribute ttynode;
class chr_file { relabelfrom relabelto };
')
########################################
## <interface name="term_write_all_user_ttys">
## <description>
@ -726,18 +644,15 @@ define(`term_relabel_all_user_ttys_depend',`
## </interface>
#
define(`term_write_all_user_ttys',`
gen_require(`$0'_depend)
gen_require(`
attribute ttynode;
class chr_file { getattr write };
')
dev_list_all_dev_nodes($1)
allow $1 ttynode:chr_file { getattr write };
')
define(`term_write_all_user_ttys_depend',`
attribute ttynode;
class chr_file { getattr write };
')
########################################
## <interface name="term_use_all_user_ttys">
## <description>
@ -749,18 +664,15 @@ define(`term_write_all_user_ttys_depend',`
## </interface>
#
define(`term_use_all_user_ttys',`
gen_require(`$0'_depend)
gen_require(`
attribute ttynode;
class chr_file { getattr read write ioctl };
')
dev_list_all_dev_nodes($1)
allow $1 ttynode:chr_file { getattr read write ioctl };
')
define(`term_use_all_user_ttys_depend',`
attribute ttynode;
class chr_file { getattr read write ioctl };
')
########################################
## <interface name="term_dontaudit_use_all_user_ttys">
## <description>
@ -773,15 +685,12 @@ define(`term_use_all_user_ttys_depend',`
## </interface>
#
define(`term_dontaudit_use_all_user_ttys',`
gen_require(`$0'_depend)
gen_require(`
attribute ttynode;
class chr_file { read write };
')
dontaudit $1 ttynode:chr_file { read write };
')
define(`term_dontaudit_use_all_user_ttys_depend',`
attribute ttynode;
class chr_file { read write };
')
## </module>