remove unneeded gen_require_set() macro

This commit is contained in:
Chris PeBenito 2006-02-01 14:00:11 +00:00
parent 5bd1a7036c
commit e52af25ee8
3 changed files with 2 additions and 26 deletions

View File

@ -740,7 +740,7 @@ interface(`domain_dontaudit_getsession_all_domains',`
# #
interface(`domain_getattr_all_sockets',` interface(`domain_getattr_all_sockets',`
gen_require(` gen_require(`
gen_require_set(getattr,socket_class_set) attribute domain;
') ')
allow $1 domain:socket_class_set getattr; allow $1 domain:socket_class_set getattr;
@ -767,7 +767,7 @@ interface(`domain_getattr_all_sockets',`
# #
interface(`domain_dontaudit_getattr_all_sockets',` interface(`domain_dontaudit_getattr_all_sockets',`
gen_require(` gen_require(`
gen_require_set(getattr,socket_class_set) attribute domain;
') ')
dontaudit $1 domain:socket_class_set getattr; dontaudit $1 domain:socket_class_set getattr;

View File

@ -2108,7 +2108,6 @@ interface(`files_filetrans_tmp',`
interface(`files_purge_tmp',` interface(`files_purge_tmp',`
gen_require(` gen_require(`
attribute tmpfile; attribute tmpfile;
gen_require_set({ getattr unlink },notdevfile_class_set)
') ')
allow $1 tmpfile:dir { rw_dir_perms rmdir }; allow $1 tmpfile:dir { rw_dir_perms rmdir };

View File

@ -223,26 +223,3 @@ define(`rw_term_perms', `{ getattr read write ioctl }')
# #
define(`client_stream_socket_perms', `{ create ioctl read getattr write setattr append bind getopt setopt shutdown }') define(`client_stream_socket_perms', `{ create ioctl read getattr write setattr append bind getopt setopt shutdown }')
define(`server_stream_socket_perms', `{ client_stream_socket_perms listen accept }') define(`server_stream_socket_perms', `{ client_stream_socket_perms listen accept }')
########################################
#
# Expand object class set macros.
#
# gen_require_set(permissions,object_class_set)
#
# the statement:
# gen_require_set({ getattr read },{ foo bar tar })
#
# makes:
# class foo { getattr read };
# class bar { getattr read };
# class tar { getattr read };
#
# !! This is only used in require blocks. !!
define(`gen_require_set',`
ifelse(regexp($2, `\w'), -1, `', `dnl
class regexp($2, `\(\w+\)', `\1') $1;
gen_require_set($1, regexp($2, `\w+\(.*\)', `\1'))dnl
') dnl
')