- ##
- ## Allow Apache to modify public files
-@@ -30,10 +32,17 @@
-
- ##
- ##
--## Allow Apache to use mod_auth_pam
-+## Allow httpd scripts and modules execmem/execstack
- ##
- ##
--gen_tunable(allow_httpd_mod_auth_pam, false)
-+gen_tunable(httpd_execmem, false)
-+
-+##
-+##
-+## Allow Apache to communicate with avahi service via dbus
-+##
-+##
-+gen_tunable(httpd_dbus_avahi, false)
-
- ##
- ##
-@@ -44,6 +53,13 @@
-
- ##
- ##
-+## Allow http daemon to send mail
-+##
-+##
-+gen_tunable(httpd_can_sendmail, false)
-+
-+##
-+##
- ## Allow HTTPD scripts and modules to connect to the network using TCP.
- ##
- ##
-@@ -51,6 +67,13 @@
-
- ##
- ##
-+## Allow HTTPD scripts and modules to connect to cobbler over the network.
-+##
-+##
-+gen_tunable(httpd_can_network_connect_cobbler, false)
-+
-+##
-+##
- ## Allow HTTPD scripts and modules to connect to databases over the network.
- ##
- ##
-@@ -87,6 +110,13 @@
-
- ##
- ##
-+## Allow httpd to read user content
-+##
-+##
-+gen_tunable(httpd_read_user_content, false)
-+
-+##
-+##
- ## Allow HTTPD to run SSI executables in the same domain as system CGI scripts.
- ##
- ##
-@@ -94,6 +124,13 @@
-
- ##
- ##
-+## Allow Apache to execute tmp content.
-+##
-+##
-+gen_tunable(httpd_tmp_exec, false)
-+
-+##
-+##
- ## Unify HTTPD to communicate with the terminal.
- ## Needed for entering the passphrase for certificates at
- ## the terminal.
-@@ -108,6 +145,36 @@
- ##
- gen_tunable(httpd_unified, false)
-
-+##
-+##
-+## Allow httpd to access nfs file systems
-+##
-+##
-+gen_tunable(httpd_use_nfs, false)
-+
-+##
-+##
-+## Allow httpd to access cifs file systems
-+##
-+##
-+gen_tunable(httpd_use_cifs, false)
-+
-+##
-+##
-+## Allow httpd to run gpg
-+##
-+##
-+gen_tunable(httpd_use_gpg, false)
-+
-+##
-+##
-+## Allow apache scripts to write to public content. Directories/Files must be labeled public_content_rw_t.
-+##
-+##
-+gen_tunable(allow_httpd_sys_script_anon_write, false)
-+
-+attribute httpd_ro_content;
-+attribute httpd_rw_content;
- attribute httpdcontent;
- attribute httpd_user_content_type;
-
-@@ -140,6 +207,9 @@
- domain_entry_file(httpd_helper_t, httpd_helper_exec_t)
- role system_r types httpd_helper_t;
-
-+type httpd_initrc_exec_t;
-+init_script_file(httpd_initrc_exec_t)
-+
- type httpd_lock_t;
- files_lock_file(httpd_lock_t)
-
-@@ -180,6 +250,10 @@
- # setup the system domain for system CGI scripts
- apache_content_template(sys)
-
-+typeattribute httpd_sys_content_t httpdcontent, httpd_ro_content; # customizable
-+typeattribute httpd_sys_content_rw_t httpdcontent, httpd_rw_content; # customizable
-+typeattribute httpd_sys_content_ra_t httpdcontent; # customizable
-+
- type httpd_tmp_t;
- files_tmp_file(httpd_tmp_t)
-
-@@ -187,28 +261,28 @@
- files_tmpfs_file(httpd_tmpfs_t)
-
- apache_content_template(user)
-+
- ubac_constrained(httpd_user_script_t)
-+typeattribute httpd_user_content_t httpdcontent;
-+typeattribute httpd_user_content_rw_t httpdcontent;
-+typeattribute httpd_user_content_ra_t httpdcontent;
-+
- userdom_user_home_content(httpd_user_content_t)
- userdom_user_home_content(httpd_user_htaccess_t)
- userdom_user_home_content(httpd_user_script_exec_t)
--userdom_user_home_content(httpd_user_script_ra_t)
--userdom_user_home_content(httpd_user_script_ro_t)
--userdom_user_home_content(httpd_user_script_rw_t)
-+userdom_user_home_content(httpd_user_content_ra_t)
-+userdom_user_home_content(httpd_user_content_rw_t)
- typeattribute httpd_user_script_t httpd_script_domains;
- typealias httpd_user_content_t alias { httpd_staff_content_t httpd_sysadm_content_t };
-+typealias httpd_user_content_t alias httpd_unconfined_content_t;
- typealias httpd_user_content_t alias { httpd_auditadm_content_t httpd_secadm_content_t };
- typealias httpd_user_htaccess_t alias { httpd_staff_htaccess_t httpd_sysadm_htaccess_t };
- typealias httpd_user_htaccess_t alias { httpd_auditadm_htaccess_t httpd_secadm_htaccess_t };
--typealias httpd_user_script_t alias { httpd_staff_script_t httpd_sysadm_script_t };
--typealias httpd_user_script_t alias { httpd_auditadm_script_t httpd_secadm_script_t };
--typealias httpd_user_script_exec_t alias { httpd_staff_script_exec_t httpd_sysadm_script_exec_t };
--typealias httpd_user_script_exec_t alias { httpd_auditadm_script_exec_t httpd_secadm_script_exec_t };
--typealias httpd_user_script_ro_t alias { httpd_staff_script_ro_t httpd_sysadm_script_ro_t };
--typealias httpd_user_script_ro_t alias { httpd_auditadm_script_ro_t httpd_secadm_script_ro_t };
--typealias httpd_user_script_rw_t alias { httpd_staff_script_rw_t httpd_sysadm_script_rw_t };
--typealias httpd_user_script_rw_t alias { httpd_auditadm_script_rw_t httpd_secadm_script_rw_t };
--typealias httpd_user_script_ra_t alias { httpd_staff_script_ra_t httpd_sysadm_script_ra_t };
--typealias httpd_user_script_ra_t alias { httpd_auditadm_script_ra_t httpd_secadm_script_ra_t };
-+typealias httpd_user_script_t alias { httpd_staff_script_t httpd_sysadm_script_t httpd_auditadm_script_t httpd_secadm_script_t };
-+typealias httpd_user_script_exec_t alias { httpd_staff_script_exec_t httpd_sysadm_script_exec_t httpd_auditadm_script_exec_t httpd_secadm_script_exec_t };
-+typealias httpd_user_content_t alias { httpd_staff_script_ro_t httpd_sysadm_script_ro_t httpd_auditadm_script_ro_t httpd_secadm_script_ro_t };
-+typealias httpd_user_content_rw_t alias { httpd_staff_script_rw_t httpd_sysadm_script_rw_t httpd_auditadm_script_rw_t httpd_secadm_script_rw_t };
-+typealias httpd_user_content_ra_t alias { httpd_staff_script_ra_t httpd_sysadm_script_ra_t httpd_auditadm_script_ra_t httpd_secadm_script_ra_t };
-
- # for apache2 memory mapped files
- type httpd_var_lib_t;
-@@ -230,7 +304,7 @@
- # Apache server local policy
- #
-
--allow httpd_t self:capability { chown dac_override kill setgid setuid sys_tty_config };
-+allow httpd_t self:capability { chown dac_override kill setgid setuid sys_nice sys_tty_config };
- dontaudit httpd_t self:capability { net_admin sys_tty_config };
- allow httpd_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
- allow httpd_t self:fd use;
-@@ -249,6 +323,7 @@
- manage_dirs_pattern(httpd_t, httpd_cache_t, httpd_cache_t)
- manage_files_pattern(httpd_t, httpd_cache_t, httpd_cache_t)
- manage_lnk_files_pattern(httpd_t, httpd_cache_t, httpd_cache_t)
-+files_var_filetrans(httpd_t, httpd_cache_t, { file dir })
-
- # Allow the httpd_t to read the web servers config files
- allow httpd_t httpd_config_t:dir list_dir_perms;
-@@ -272,6 +347,7 @@
- allow httpd_t httpd_modules_t:dir list_dir_perms;
- mmap_files_pattern(httpd_t, httpd_modules_t, httpd_modules_t)
- read_files_pattern(httpd_t, httpd_modules_t, httpd_modules_t)
-+read_lnk_files_pattern(httpd_t, httpd_modules_t, httpd_modules_t)
-
- apache_domtrans_rotatelogs(httpd_t)
- # Apache-httpd needs to be able to send signals to the log rotate procs.
-@@ -283,13 +359,14 @@
-
- allow httpd_t httpd_suexec_exec_t:file read_file_perms;
-
--allow httpd_t httpd_sys_content_t:dir list_dir_perms;
--read_files_pattern(httpd_t, httpd_sys_content_t, httpd_sys_content_t)
--read_lnk_files_pattern(httpd_t, httpd_sys_content_t, httpd_sys_content_t)
-+allow httpd_t httpd_ro_content:dir list_dir_perms;
-+read_files_pattern(httpd_t, httpd_ro_content, httpd_ro_content)
-+read_lnk_files_pattern(httpd_t, httpd_ro_content, httpd_ro_content)
-
- manage_dirs_pattern(httpd_t, httpd_tmp_t, httpd_tmp_t)
- manage_files_pattern(httpd_t, httpd_tmp_t, httpd_tmp_t)
--files_tmp_filetrans(httpd_t, httpd_tmp_t, { file dir })
-+manage_lnk_files_pattern(httpd_t, httpd_tmp_t, httpd_tmp_t)
-+files_tmp_filetrans(httpd_t, httpd_tmp_t, { file dir lnk_file })
-
- manage_dirs_pattern(httpd_t, httpd_tmpfs_t, httpd_tmpfs_t)
- manage_files_pattern(httpd_t, httpd_tmpfs_t, httpd_tmpfs_t)
-@@ -301,9 +378,11 @@
- manage_files_pattern(httpd_t, httpd_var_lib_t, httpd_var_lib_t)
- files_var_lib_filetrans(httpd_t, httpd_var_lib_t, file)
-
-+setattr_dirs_pattern(httpd_t, httpd_var_run_t, httpd_var_run_t)
-+manage_dirs_pattern(httpd_t, httpd_var_run_t, httpd_var_run_t)
- manage_files_pattern(httpd_t, httpd_var_run_t, httpd_var_run_t)
- manage_sock_files_pattern(httpd_t, httpd_var_run_t, httpd_var_run_t)
--files_pid_filetrans(httpd_t, httpd_var_run_t, { file sock_file })
-+files_pid_filetrans(httpd_t, httpd_var_run_t, { file sock_file dir })
-
- manage_dirs_pattern(httpd_t, squirrelmail_spool_t, squirrelmail_spool_t)
- manage_files_pattern(httpd_t, squirrelmail_spool_t, squirrelmail_spool_t)
-@@ -312,18 +391,21 @@
- kernel_read_kernel_sysctls(httpd_t)
- # for modules that want to access /proc/meminfo
- kernel_read_system_state(httpd_t)
-+kernel_search_network_sysctl(httpd_t)
-
- corenet_all_recvfrom_unlabeled(httpd_t)
- corenet_all_recvfrom_netlabel(httpd_t)
--corenet_tcp_sendrecv_generic_if(httpd_t)
--corenet_udp_sendrecv_generic_if(httpd_t)
--corenet_tcp_sendrecv_generic_node(httpd_t)
--corenet_udp_sendrecv_generic_node(httpd_t)
-+corenet_tcp_sendrecv_all_if(httpd_t)
-+corenet_udp_sendrecv_all_if(httpd_t)
-+corenet_tcp_sendrecv_all_nodes(httpd_t)
-+corenet_udp_sendrecv_all_nodes(httpd_t)
- corenet_tcp_sendrecv_all_ports(httpd_t)
- corenet_udp_sendrecv_all_ports(httpd_t)
--corenet_tcp_bind_generic_node(httpd_t)
-+corenet_tcp_bind_all_nodes(httpd_t)
-+corenet_udp_bind_all_nodes(httpd_t)
- corenet_tcp_bind_http_port(httpd_t)
- corenet_tcp_bind_http_cache_port(httpd_t)
-+corenet_tcp_bind_ntop_port(httpd_t)
- corenet_sendrecv_http_server_packets(httpd_t)
- # Signal self for shutdown
- corenet_tcp_connect_http_port(httpd_t)
-@@ -335,15 +417,16 @@
-
- fs_getattr_all_fs(httpd_t)
- fs_search_auto_mountpoints(httpd_t)
-+fs_read_iso9660_files(httpd_t)
-+fs_read_anon_inodefs_files(httpd_t)
-
- auth_use_nsswitch(httpd_t)
-
--# execute perl
--corecmd_exec_bin(httpd_t)
--corecmd_exec_shell(httpd_t)
-+application_exec_all(httpd_t)
-
- domain_use_interactive_fds(httpd_t)
-
-+files_dontaudit_getattr_all_pids(httpd_t)
- files_read_usr_files(httpd_t)
- files_list_mnt(httpd_t)
- files_search_spool(httpd_t)
-@@ -358,6 +441,10 @@
- files_read_var_lib_symlinks(httpd_t)
-
- fs_search_auto_mountpoints(httpd_sys_script_t)
-+# php uploads a file to /tmp and then execs programs to acton them
-+manage_dirs_pattern(httpd_sys_script_t, httpd_tmp_t, httpd_tmp_t)
-+manage_files_pattern(httpd_sys_script_t, httpd_tmp_t, httpd_tmp_t)
-+files_tmp_filetrans(httpd_sys_script_t, httpd_sys_content_rw_t, { dir file lnk_file sock_file fifo_file })
-
- libs_read_lib_files(httpd_t)
-
-@@ -372,18 +459,33 @@
-
- userdom_use_unpriv_users_fds(httpd_t)
-
--mta_send_mail(httpd_t)
--
- tunable_policy(`allow_httpd_anon_write',`
- miscfiles_manage_public_files(httpd_t)
- ')
-
--ifdef(`TODO', `
- #
- # We need optionals to be able to be within booleans to make this work
- #
-+##
-+##
-+## Allow Apache to use mod_auth_pam
-+##
-+##
-+gen_tunable(allow_httpd_mod_auth_pam, false)
-+
-+tunable_policy(`allow_httpd_mod_auth_pam',`
-+ auth_domtrans_chkpwd(httpd_t)
-+')
-+
-+##
-+##
-+## Allow Apache to use mod_auth_pam
-+##
-+##
-+gen_tunable(allow_httpd_mod_auth_ntlm_winbind, false)
-+optional_policy(`
- tunable_policy(`allow_httpd_mod_auth_pam',`
-- auth_domtrans_chk_passwd(httpd_t)
-+ samba_domtrans_winbind_helper(httpd_t)
- ')
- ')
-
-@@ -391,32 +493,71 @@
- corenet_tcp_connect_all_ports(httpd_t)
- ')
-
-+tunable_policy(`httpd_can_sendmail',`
-+ # allow httpd to connect to mail servers
-+ corenet_tcp_connect_smtp_port(httpd_t)
-+ corenet_sendrecv_smtp_client_packets(httpd_t)
-+ corenet_tcp_connect_pop_port(httpd_t)
-+ corenet_sendrecv_pop_client_packets(httpd_t)
-+ mta_send_mail(httpd_t)
-+ mta_signal(httpd_t)
-+ mta_send_mail(httpd_sys_script_t)
-+')
-+
- tunable_policy(`httpd_can_network_relay',`
- # allow httpd to work as a relay
- corenet_tcp_connect_gopher_port(httpd_t)
- corenet_tcp_connect_ftp_port(httpd_t)
- corenet_tcp_connect_http_port(httpd_t)
- corenet_tcp_connect_http_cache_port(httpd_t)
-+ corenet_tcp_connect_memcache_port(httpd_t)
- corenet_sendrecv_gopher_client_packets(httpd_t)
- corenet_sendrecv_ftp_client_packets(httpd_t)
- corenet_sendrecv_http_client_packets(httpd_t)
- corenet_sendrecv_http_cache_client_packets(httpd_t)
- ')
-
-+tunable_policy(`httpd_enable_cgi && httpd_unified',`
-+ allow httpd_sys_script_t httpd_sys_content_t:file entrypoint;
-+ filetrans_pattern(httpd_sys_script_t, httpd_sys_content_t, httpd_sys_content_rw_t, { file dir lnk_file })
-+ can_exec(httpd_sys_script_t, httpd_sys_content_t)
-+')
-+
-+tunable_policy(`allow_httpd_sys_script_anon_write',`
-+ miscfiles_manage_public_files(httpd_sys_script_t)
-+')
-+
-+tunable_policy(`httpd_enable_cgi && httpd_use_nfs',`
-+ fs_nfs_domtrans(httpd_t, httpd_sys_script_t)
-+')
-+
-+tunable_policy(`httpd_enable_cgi && httpd_use_cifs',`
-+ fs_cifs_domtrans(httpd_t, httpd_sys_script_t)
-+')
-+
-+
- tunable_policy(`httpd_enable_cgi && httpd_unified && httpd_builtin_scripting',`
-- domtrans_pattern(httpd_t, httpdcontent, httpd_sys_script_t)
-+ domtrans_pattern(httpd_t, httpd_sys_content_t, httpd_sys_script_t)
-+ filetrans_pattern(httpd_t, httpd_sys_content_t, httpd_sys_content_rw_t, { file dir lnk_file })
-+ manage_dirs_pattern(httpd_t, httpdcontent, httpd_sys_content_rw_t)
-+ manage_files_pattern(httpd_t, httpdcontent, httpd_sys_content_rw_t)
-+ manage_lnk_files_pattern(httpd_t, httpdcontent, httpd_sys_content_rw_t)
-
- manage_dirs_pattern(httpd_t, httpdcontent, httpdcontent)
- manage_files_pattern(httpd_t, httpdcontent, httpdcontent)
- manage_lnk_files_pattern(httpd_t, httpdcontent, httpdcontent)
- ')
-
--tunable_policy(`httpd_enable_ftp_server',`
-- corenet_tcp_bind_ftp_port(httpd_t)
-+tunable_policy(`httpd_tmp_exec && httpd_builtin_scripting',`
-+ can_exec(httpd_t, httpd_tmp_t)
- ')
-
--tunable_policy(`httpd_enable_homedirs',`
-- userdom_read_user_home_content_files(httpd_t)
-+tunable_policy(`httpd_tmp_exec && httpd_enable_cgi',`
-+ can_exec(httpd_sys_script_t, httpd_tmp_t)
-+')
-+
-+tunable_policy(`httpd_enable_ftp_server',`
-+ corenet_tcp_bind_ftp_port(httpd_t)
- ')
-
- tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',`
-@@ -424,11 +565,23 @@
- fs_read_nfs_symlinks(httpd_t)
- ')
-
-+tunable_policy(`httpd_use_nfs',`
-+ fs_manage_nfs_dirs(httpd_t)
-+ fs_manage_nfs_files(httpd_t)
-+ fs_manage_nfs_symlinks(httpd_t)
-+')
-+
- tunable_policy(`httpd_enable_homedirs && use_samba_home_dirs',`
- fs_read_cifs_files(httpd_t)
- fs_read_cifs_symlinks(httpd_t)
- ')
-
-+tunable_policy(`httpd_use_cifs',`
-+ fs_manage_cifs_dirs(httpd_t)
-+ fs_manage_cifs_files(httpd_t)
-+ fs_manage_cifs_symlinks(httpd_t)
-+')
-+
- tunable_policy(`httpd_ssi_exec',`
- corecmd_shell_domtrans(httpd_t, httpd_sys_script_t)
- allow httpd_sys_script_t httpd_t:fd use;
-@@ -451,7 +604,18 @@
- ')
-
- optional_policy(`
-+ ccs_read_config(httpd_t)
-+')
-+
-+optional_policy(`
-+ cvs_read_data(httpd_t)
-+')
-+
-+optional_policy(`
- cobbler_search_lib(httpd_t)
-+ tunable_policy(`httpd_can_network_connect_cobbler',`
-+ corenet_tcp_connect_cobbler_port(httpd_t)
-+ ')
- ')
-
- optional_policy(`
-@@ -463,8 +627,24 @@
- ')
-
- optional_policy(`
-- kerberos_use(httpd_t)
-- kerberos_read_kdc_config(httpd_t)
-+ dbus_system_bus_client(httpd_t)
-+ tunable_policy(`httpd_dbus_avahi',`
-+ avahi_dbus_chat(httpd_t)
-+ ')
-+')
-+
-+optional_policy(`
-+ gitosis_read_var_lib(httpd_t)
-+')
-+
-+optional_policy(`
-+tunable_policy(`httpd_enable_cgi && httpd_use_gpg',`
-+ gpg_domtrans(httpd_t)
-+')
-+')
-+
-+optional_policy(`
-+ kerberos_keytab_template(httpd, httpd_t)
- ')
-
- optional_policy(`
-@@ -472,22 +652,19 @@
- mailman_domtrans_cgi(httpd_t)
- # should have separate types for public and private archives
- mailman_search_data(httpd_t)
-+ mailman_read_data_files(httpd_t)
- mailman_read_archive(httpd_t)
- ')
-
- optional_policy(`
-- # Allow httpd to work with mysql
- mysql_stream_connect(httpd_t)
- mysql_rw_db_sockets(httpd_t)
--
-- tunable_policy(`httpd_can_network_connect_db',`
-- mysql_tcp_connect(httpd_t)
-- ')
-+ mysql_read_config(httpd_t)
- ')
-
- optional_policy(`
- nagios_read_config(httpd_t)
-- nagios_domtrans_cgi(httpd_t)
-+ nagios_read_log(httpd_t)
- ')
-
- optional_policy(`
-@@ -498,12 +675,23 @@
- ')
-
- optional_policy(`
-+ rpc_search_nfs_state_data(httpd_t)
-+')
-+
-+tunable_policy(`httpd_execmem',`
-+ allow httpd_t self:process { execmem execstack };
-+ allow httpd_sys_script_t self:process { execmem execstack };
-+ allow httpd_suexec_t self:process { execmem execstack };
-+')
-+
-+optional_policy(`
- # Allow httpd to work with postgresql
- postgresql_stream_connect(httpd_t)
- postgresql_unpriv_client(httpd_t)
-
- tunable_policy(`httpd_can_network_connect_db',`
- postgresql_tcp_connect(httpd_t)
-+ postgresql_tcp_connect(httpd_sys_script_t)
- ')
- ')
-
-@@ -512,6 +700,11 @@
- ')
-
- optional_policy(`
-+ smokeping_getattr_lib_files(httpd_t)
-+')
-+
-+optional_policy(`
-+ files_dontaudit_rw_usr_dirs(httpd_t)
- snmp_dontaudit_read_snmp_var_lib_files(httpd_t)
- snmp_dontaudit_write_snmp_var_lib_files(httpd_t)
- ')
-@@ -539,6 +732,23 @@
-
- userdom_use_user_terminals(httpd_helper_t)
-
-+tunable_policy(`httpd_tty_comm',`
-+ userdom_use_user_terminals(httpd_helper_t)
-+')
-+
-+optional_policy(`
-+ type httpd_unconfined_script_t;
-+ type httpd_unconfined_script_exec_t;
-+ domain_type(httpd_unconfined_script_t)
-+ domain_entry_file(httpd_unconfined_script_t, httpd_unconfined_script_exec_t)
-+ domtrans_pattern(httpd_t, httpd_unconfined_script_exec_t, httpd_unconfined_script_t)
-+ unconfined_domain(httpd_unconfined_script_t)
-+
-+ role system_r types httpd_unconfined_script_t;
-+ allow httpd_t httpd_unconfined_script_t:process signal_perms;
-+')
-+
-+
- ########################################
- #
- # Apache PHP script local policy
-@@ -568,20 +778,32 @@
-
- fs_search_auto_mountpoints(httpd_php_t)
-
-+auth_use_nsswitch(httpd_php_t)
-+
- libs_exec_lib_files(httpd_php_t)
-
- userdom_use_unpriv_users_fds(httpd_php_t)
-
--optional_policy(`
-- mysql_stream_connect(httpd_php_t)
-+tunable_policy(`httpd_can_network_connect_db',`
-+ corenet_tcp_connect_mysqld_port(httpd_t)
-+ corenet_sendrecv_mysqld_client_packets(httpd_t)
-+ corenet_tcp_connect_mysqld_port(httpd_sys_script_t)
-+ corenet_sendrecv_mysqld_client_packets(httpd_sys_script_t)
-+ corenet_tcp_connect_mysqld_port(httpd_suexec_t)
-+ corenet_sendrecv_mysqld_client_packets(httpd_suexec_t)
-+
-+ corenet_tcp_connect_mssql_port(httpd_t)
-+ corenet_sendrecv_mssql_client_packets(httpd_t)
-+ corenet_tcp_connect_mssql_port(httpd_sys_script_t)
-+ corenet_sendrecv_mssql_client_packets(httpd_sys_script_t)
-+ corenet_tcp_connect_mssql_port(httpd_suexec_t)
-+ corenet_sendrecv_mssql_client_packets(httpd_suexec_t)
- ')
-
--optional_policy(`
-- nis_use_ypbind(httpd_php_t)
--')
-
- optional_policy(`
-- postgresql_stream_connect(httpd_php_t)
-+ mysql_stream_connect(httpd_php_t)
-+ mysql_read_config(httpd_php_t)
- ')
-
- ########################################
-@@ -599,23 +821,24 @@
- append_files_pattern(httpd_suexec_t, httpd_log_t, httpd_log_t)
- read_files_pattern(httpd_suexec_t, httpd_log_t, httpd_log_t)
-
--allow httpd_suexec_t httpd_t:fifo_file getattr;
-+allow httpd_suexec_t httpd_t:fifo_file read_fifo_file_perms;
-
- manage_dirs_pattern(httpd_suexec_t, httpd_suexec_tmp_t, httpd_suexec_tmp_t)
- manage_files_pattern(httpd_suexec_t, httpd_suexec_tmp_t, httpd_suexec_tmp_t)
- files_tmp_filetrans(httpd_suexec_t, httpd_suexec_tmp_t, { file dir })
-
-+can_exec(httpd_suexec_t, httpd_sys_script_exec_t)
-+
- kernel_read_kernel_sysctls(httpd_suexec_t)
- kernel_list_proc(httpd_suexec_t)
- kernel_read_proc_symlinks(httpd_suexec_t)
-
- dev_read_urand(httpd_suexec_t)
-
-+fs_read_iso9660_files(httpd_suexec_t)
- fs_search_auto_mountpoints(httpd_suexec_t)
-
--# for shell scripts
--corecmd_exec_bin(httpd_suexec_t)
--corecmd_exec_shell(httpd_suexec_t)
-+application_exec_all(httpd_suexec_t)
-
- files_read_etc_files(httpd_suexec_t)
- files_read_usr_files(httpd_suexec_t)
-@@ -628,6 +851,7 @@
- logging_send_syslog_msg(httpd_suexec_t)
-
- miscfiles_read_localization(httpd_suexec_t)
-+miscfiles_read_public_files(httpd_suexec_t)
-
- tunable_policy(`httpd_can_network_connect',`
- allow httpd_suexec_t self:tcp_socket create_stream_socket_perms;
-@@ -635,22 +859,31 @@
-
- corenet_all_recvfrom_unlabeled(httpd_suexec_t)
- corenet_all_recvfrom_netlabel(httpd_suexec_t)
-- corenet_tcp_sendrecv_generic_if(httpd_suexec_t)
-- corenet_udp_sendrecv_generic_if(httpd_suexec_t)
-- corenet_tcp_sendrecv_generic_node(httpd_suexec_t)
-- corenet_udp_sendrecv_generic_node(httpd_suexec_t)
-+ corenet_tcp_sendrecv_all_if(httpd_suexec_t)
-+ corenet_udp_sendrecv_all_if(httpd_suexec_t)
-+ corenet_tcp_sendrecv_all_nodes(httpd_suexec_t)
-+ corenet_udp_sendrecv_all_nodes(httpd_suexec_t)
- corenet_tcp_sendrecv_all_ports(httpd_suexec_t)
- corenet_udp_sendrecv_all_ports(httpd_suexec_t)
- corenet_tcp_connect_all_ports(httpd_suexec_t)
- corenet_sendrecv_all_client_packets(httpd_suexec_t)
- ')
-
-+read_files_pattern(httpd_suexec_t, httpd_user_content_t, httpd_user_content_t)
-+read_files_pattern(httpd_suexec_t, httpd_user_content_rw_t, httpd_user_content_rw_t)
-+read_files_pattern(httpd_suexec_t, httpd_user_content_ra_t, httpd_user_content_ra_t)
-+
-+domain_entry_file(httpd_sys_script_t, httpd_sys_content_t)
- tunable_policy(`httpd_enable_cgi && httpd_unified',`
-+ allow httpd_sys_script_t httpdcontent:file entrypoint;
- domtrans_pattern(httpd_suexec_t, httpdcontent, httpd_sys_script_t)
-+ manage_dirs_pattern(httpd_sys_script_t, httpdcontent, httpdcontent)
-+ manage_files_pattern(httpd_sys_script_t, httpdcontent, httpdcontent)
-+ manage_sock_files_pattern(httpd_sys_script_t, httpdcontent, httpdcontent)
-+ manage_lnk_files_pattern(httpd_sys_script_t, httpdcontent, httpdcontent)
- ')
--
--tunable_policy(`httpd_enable_homedirs',`
-- userdom_read_user_home_content_files(httpd_suexec_t)
-+tunable_policy(`httpd_enable_cgi',`
-+ domtrans_pattern(httpd_suexec_t, httpd_user_script_t, httpd_user_script_t)
- ')
-
- tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',`
-@@ -676,16 +909,16 @@
- dontaudit httpd_suexec_t httpd_t:unix_stream_socket { read write };
- ')
-
--optional_policy(`
-- nagios_domtrans_cgi(httpd_suexec_t)
--')
--
- ########################################
- #
- # Apache system script local policy
- #
-
-+allow httpd_sys_script_t self:process getsched;
-+
-+allow httpd_sys_script_t httpd_t:unix_stream_socket rw_stream_socket_perms;
- allow httpd_sys_script_t httpd_t:tcp_socket { read write };
-+allow httpd_t httpd_sys_script_t:unix_stream_socket connectto;
-
- dontaudit httpd_sys_script_t httpd_config_t:dir search;
-
-@@ -700,15 +933,29 @@
- files_search_var_lib(httpd_sys_script_t)
- files_search_spool(httpd_sys_script_t)
-
-+logging_inherit_append_all_logs(httpd_sys_script_t)
-+
- # Should we add a boolean?
- apache_domtrans_rotatelogs(httpd_sys_script_t)
-
-+auth_use_nsswitch(httpd_sys_script_t)
-+
- ifdef(`distro_redhat',`
- allow httpd_sys_script_t httpd_log_t:file append_file_perms;
- ')
-
--tunable_policy(`httpd_enable_homedirs',`
-- userdom_read_user_home_content_files(httpd_sys_script_t)
-+fs_read_iso9660_files(httpd_sys_script_t)
-+
-+tunable_policy(`httpd_use_nfs',`
-+ fs_manage_nfs_dirs(httpd_sys_script_t)
-+ fs_manage_nfs_files(httpd_sys_script_t)
-+ fs_manage_nfs_symlinks(httpd_sys_script_t)
-+ fs_exec_nfs_files(httpd_sys_script_t)
-+
-+ fs_manage_nfs_dirs(httpd_suexec_t)
-+ fs_manage_nfs_files(httpd_suexec_t)
-+ fs_manage_nfs_symlinks(httpd_suexec_t)
-+ fs_exec_nfs_files(httpd_suexec_t)
- ')
-
- tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',`
-@@ -716,6 +963,35 @@
- fs_read_nfs_symlinks(httpd_sys_script_t)
- ')
-
-+tunable_policy(`httpd_enable_cgi && httpd_can_network_connect',`
-+ allow httpd_sys_script_t self:tcp_socket create_stream_socket_perms;
-+ allow httpd_sys_script_t self:udp_socket create_socket_perms;
-+
-+ corenet_tcp_bind_all_nodes(httpd_sys_script_t)
-+ corenet_udp_bind_all_nodes(httpd_sys_script_t)
-+ corenet_all_recvfrom_unlabeled(httpd_sys_script_t)
-+ corenet_all_recvfrom_netlabel(httpd_sys_script_t)
-+ corenet_tcp_sendrecv_all_if(httpd_sys_script_t)
-+ corenet_udp_sendrecv_all_if(httpd_sys_script_t)
-+ corenet_tcp_sendrecv_all_nodes(httpd_sys_script_t)
-+ corenet_udp_sendrecv_all_nodes(httpd_sys_script_t)
-+ corenet_tcp_sendrecv_all_ports(httpd_sys_script_t)
-+ corenet_udp_sendrecv_all_ports(httpd_sys_script_t)
-+ corenet_tcp_connect_all_ports(httpd_sys_script_t)
-+ corenet_sendrecv_all_client_packets(httpd_sys_script_t)
-+')
-+
-+
-+tunable_policy(`httpd_use_cifs',`
-+ fs_manage_cifs_dirs(httpd_sys_script_t)
-+ fs_manage_cifs_files(httpd_sys_script_t)
-+ fs_manage_cifs_symlinks(httpd_sys_script_t)
-+ fs_manage_cifs_dirs(httpd_suexec_t)
-+ fs_manage_cifs_files(httpd_suexec_t)
-+ fs_manage_cifs_symlinks(httpd_suexec_t)
-+ fs_exec_cifs_files(httpd_suexec_t)
-+')
-+
- tunable_policy(`httpd_enable_homedirs && use_samba_home_dirs',`
- fs_read_cifs_files(httpd_sys_script_t)
- fs_read_cifs_symlinks(httpd_sys_script_t)
-@@ -728,6 +1004,10 @@
- optional_policy(`
- mysql_stream_connect(httpd_sys_script_t)
- mysql_rw_db_sockets(httpd_sys_script_t)
-+ mysql_read_config(httpd_sys_script_t)
-+ mysql_stream_connect(httpd_suexec_t)
-+ mysql_rw_db_sockets(httpd_suexec_t)
-+ mysql_read_config(httpd_suexec_t)
- ')
-
- optional_policy(`
-@@ -739,6 +1019,8 @@
- # httpd_rotatelogs local policy
- #
-
-+allow httpd_rotatelogs_t self:capability dac_override;
-+
- manage_files_pattern(httpd_rotatelogs_t, httpd_log_t, httpd_log_t)
-
- kernel_read_kernel_sysctls(httpd_rotatelogs_t)
-@@ -758,11 +1040,88 @@
-
- tunable_policy(`httpd_enable_cgi && httpd_unified',`
- allow httpd_user_script_t httpdcontent:file entrypoint;
-+ manage_dirs_pattern(httpd_user_script_t, httpd_user_content_t, httpd_user_content_t)
-+ manage_files_pattern(httpd_user_script_t, httpd_user_content_t, httpd_user_content_t)
-+ manage_dirs_pattern(httpd_user_script_t, httpd_user_content_ra_t, httpd_user_content_ra_t)
-+ manage_files_pattern(httpd_user_script_t, httpd_user_content_ra_t, httpd_user_content_ra_t)
-+ manage_dirs_pattern(httpd_user_script_t, httpd_user_content_rw_t, httpd_user_content_rw_t)
-+ manage_files_pattern(httpd_user_script_t, httpd_user_content_rw_t, httpd_user_content_rw_t)
- ')
-
- # allow accessing files/dirs below the users home dir
- tunable_policy(`httpd_enable_homedirs',`
-- userdom_search_user_home_dirs(httpd_t)
-- userdom_search_user_home_dirs(httpd_suexec_t)
-- userdom_search_user_home_dirs(httpd_user_script_t)
-+ userdom_search_user_home_content(httpd_t)
-+ userdom_search_user_home_content(httpd_suexec_t)
-+ userdom_search_user_home_content(httpd_user_script_t)
- ')
-+
-+tunable_policy(`httpd_read_user_content',`
-+ userdom_read_user_home_content_files(httpd_user_script_t)
-+ userdom_read_user_home_content_files(httpd_suexec_t)
-+')
-+
-+tunable_policy(`httpd_read_user_content && httpd_builtin_scripting',`
-+ userdom_read_user_home_content_files(httpd_t)
-+')
-+
-+#============= bugzilla policy ==============
-+apache_content_template(bugzilla)
-+
-+type httpd_bugzilla_tmp_t;
-+files_tmp_file(httpd_bugzilla_tmp_t)
-+
-+allow httpd_bugzilla_script_t self:netlink_route_socket r_netlink_socket_perms;
-+allow httpd_bugzilla_script_t self:tcp_socket create_stream_socket_perms;
-+allow httpd_bugzilla_script_t self:udp_socket create_socket_perms;
-+
-+corenet_all_recvfrom_unlabeled(httpd_bugzilla_script_t)
-+corenet_all_recvfrom_netlabel(httpd_bugzilla_script_t)
-+corenet_tcp_sendrecv_all_if(httpd_bugzilla_script_t)
-+corenet_udp_sendrecv_all_if(httpd_bugzilla_script_t)
-+corenet_tcp_sendrecv_all_nodes(httpd_bugzilla_script_t)
-+corenet_udp_sendrecv_all_nodes(httpd_bugzilla_script_t)
-+corenet_tcp_sendrecv_all_ports(httpd_bugzilla_script_t)
-+corenet_udp_sendrecv_all_ports(httpd_bugzilla_script_t)
-+corenet_tcp_connect_postgresql_port(httpd_bugzilla_script_t)
-+corenet_tcp_connect_mysqld_port(httpd_bugzilla_script_t)
-+corenet_tcp_connect_http_port(httpd_bugzilla_script_t)
-+corenet_tcp_connect_smtp_port(httpd_bugzilla_script_t)
-+corenet_sendrecv_postgresql_client_packets(httpd_bugzilla_script_t)
-+corenet_sendrecv_mysqld_client_packets(httpd_bugzilla_script_t)
-+
-+manage_dirs_pattern(httpd_bugzilla_script_t, httpd_bugzilla_tmp_t, httpd_bugzilla_tmp_t)
-+manage_files_pattern(httpd_bugzilla_script_t, httpd_bugzilla_tmp_t, httpd_bugzilla_tmp_t)
-+files_tmp_filetrans(httpd_bugzilla_script_t, httpd_bugzilla_tmp_t, { file dir })
-+
-+files_search_var_lib(httpd_bugzilla_script_t)
-+
-+mta_send_mail(httpd_bugzilla_script_t)
-+
-+sysnet_read_config(httpd_bugzilla_script_t)
-+sysnet_use_ldap(httpd_bugzilla_script_t)
-+
-+optional_policy(`
-+ mysql_search_db(httpd_bugzilla_script_t)
-+ mysql_stream_connect(httpd_bugzilla_script_t)
-+')
-+
-+optional_policy(`
-+ postgresql_stream_connect(httpd_bugzilla_script_t)
-+')
-+
-+manage_dirs_pattern(httpd_sys_script_t,httpdcontent,httpd_rw_content)
-+manage_files_pattern(httpd_sys_script_t,httpdcontent,httpd_rw_content)
-+manage_lnk_files_pattern(httpd_sys_script_t,httpdcontent,httpd_rw_content)
-+
-+manage_dirs_pattern(httpd_t,httpdcontent,httpd_rw_content)
-+manage_files_pattern(httpd_t,httpdcontent,httpd_rw_content)
-+manage_lnk_files_pattern(httpd_t,httpdcontent,httpd_rw_content)
-+
-+# Removal of fastcgi, will cause problems without the following
-+typealias httpd_sys_script_exec_t alias httpd_fastcgi_script_exec_t;
-+typealias httpd_sys_content_t alias { httpd_fastcgi_content_t httpd_fastcgi_script_ro_t };
-+typealias httpd_sys_content_rw_t alias { httpd_fastcgi_content_rw_t httpd_fastcgi_script_rw_t };
-+typealias httpd_sys_content_ra_t alias httpd_fastcgi_script_ra_t;
-+typealias httpd_sys_script_t alias httpd_fastcgi_script_t;
-+typealias httpd_var_run_t alias httpd_fastcgi_var_run_t;
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcupsd.te serefpolicy-3.7.15/policy/modules/services/apcupsd.te
---- nsaserefpolicy/policy/modules/services/apcupsd.te 2010-03-04 11:17:25.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/apcupsd.te 2010-03-18 10:44:42.000000000 -0400
-@@ -95,6 +95,10 @@
- ')
-
- optional_policy(`
-+ shutdown_domtrans(apcupsd_t)
-+')
-+
-+optional_policy(`
- mta_send_mail(apcupsd_t)
- mta_system_content(apcupsd_tmp_t)
- ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/arpwatch.te serefpolicy-3.7.15/policy/modules/services/arpwatch.te
---- nsaserefpolicy/policy/modules/services/arpwatch.te 2010-03-04 11:17:25.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/arpwatch.te 2010-03-18 10:44:42.000000000 -0400
-@@ -34,6 +34,7 @@
- allow arpwatch_t self:tcp_socket { connect create_stream_socket_perms };
- allow arpwatch_t self:udp_socket create_socket_perms;
- allow arpwatch_t self:packet_socket create_socket_perms;
-+allow arpwatch_t self:socket create_socket_perms;
-
- manage_dirs_pattern(arpwatch_t, arpwatch_data_t, arpwatch_data_t)
- manage_files_pattern(arpwatch_t, arpwatch_data_t, arpwatch_data_t)
-@@ -46,6 +47,7 @@
- manage_files_pattern(arpwatch_t, arpwatch_var_run_t, arpwatch_var_run_t)
- files_pid_filetrans(arpwatch_t, arpwatch_var_run_t, file)
-
-+kernel_read_network_state(arpwatch_t)
- kernel_read_kernel_sysctls(arpwatch_t)
- kernel_list_proc(arpwatch_t)
- kernel_read_proc_symlinks(arpwatch_t)
-@@ -62,6 +64,8 @@
- corenet_udp_sendrecv_all_ports(arpwatch_t)
-
- dev_read_sysfs(arpwatch_t)
-+dev_read_usbmon_dev(arpwatch_t)
-+dev_rw_generic_usb_dev(arpwatch_t)
-
- fs_getattr_all_fs(arpwatch_t)
- fs_search_auto_mountpoints(arpwatch_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/asterisk.if serefpolicy-3.7.15/policy/modules/services/asterisk.if
---- nsaserefpolicy/policy/modules/services/asterisk.if 2009-12-18 11:38:25.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/asterisk.if 2010-03-18 10:44:43.000000000 -0400
-@@ -1,5 +1,24 @@
- ## Asterisk IP telephony server
-
-+######################################
-+##
-+## Execute asterisk in the asterisk domain.
-+##
-+##
-+##
-+## The type of the process performing this action.
-+##
-+##
-+#
-+interface(`asterisk_domtrans',`
-+ gen_require(`
-+ type asterisk_t, asterisk_exec_t;
-+ ')
-+
-+ corecmd_search_bin($1)
-+ domtrans_pattern($1, asterisk_exec_t, asterisk_t)
-+')
-+
- #####################################
- ##
- ## Connect to asterisk over a unix domain
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/asterisk.te serefpolicy-3.7.15/policy/modules/services/asterisk.te
---- nsaserefpolicy/policy/modules/services/asterisk.te 2009-12-18 11:38:25.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/asterisk.te 2010-03-18 10:44:43.000000000 -0400
-@@ -40,12 +40,13 @@
- #
-
- # dac_override for /var/run/asterisk
--allow asterisk_t self:capability { dac_override setgid setuid sys_nice };
-+allow asterisk_t self:capability { dac_override setgid setuid sys_nice net_admin };
- dontaudit asterisk_t self:capability sys_tty_config;
--allow asterisk_t self:process { setsched signal_perms };
-+allow asterisk_t self:process { getsched setsched signal_perms getcap setcap };
- allow asterisk_t self:fifo_file rw_fifo_file_perms;
- allow asterisk_t self:sem create_sem_perms;
- allow asterisk_t self:shm create_shm_perms;
-+allow asterisk_t self:unix_stream_socket connectto;
- allow asterisk_t self:tcp_socket create_stream_socket_perms;
- allow asterisk_t self:udp_socket create_socket_perms;
-
-@@ -79,11 +80,14 @@
- manage_sock_files_pattern(asterisk_t, asterisk_var_run_t, asterisk_var_run_t)
- files_pid_filetrans(asterisk_t, asterisk_var_run_t, file)
-
-+can_exec(asterisk_t, asterisk_exec_t)
-+
- kernel_read_system_state(asterisk_t)
- kernel_read_kernel_sysctls(asterisk_t)
-+kernel_request_load_module(asterisk_t)
-
- corecmd_exec_bin(asterisk_t)
--corecmd_search_bin(asterisk_t)
-+corecmd_exec_shell(asterisk_t)
-
- corenet_all_recvfrom_unlabeled(asterisk_t)
- corenet_all_recvfrom_netlabel(asterisk_t)
-@@ -104,10 +108,14 @@
- corenet_udp_bind_generic_port(asterisk_t)
- corenet_dontaudit_udp_bind_all_ports(asterisk_t)
- corenet_sendrecv_generic_server_packets(asterisk_t)
-+corenet_tcp_connect_postgresql_port(asterisk_t)
-+corenet_tcp_connect_snmp_port(asterisk_t)
-
-+dev_rw_generic_usb_dev(asterisk_t)
- dev_read_sysfs(asterisk_t)
- dev_read_sound(asterisk_t)
- dev_write_sound(asterisk_t)
-+dev_read_urand(asterisk_t)
-
- domain_use_interactive_fds(asterisk_t)
-
-@@ -118,19 +126,33 @@
- files_read_usr_files(asterisk_t)
-
- fs_getattr_all_fs(asterisk_t)
-+fs_list_inotifyfs(asterisk_t)
-+fs_read_anon_inodefs_files(asterisk_t)
- fs_search_auto_mountpoints(asterisk_t)
-
-+auth_use_nsswitch(asterisk_t)
-+
- logging_send_syslog_msg(asterisk_t)
-
- miscfiles_read_localization(asterisk_t)
-
--sysnet_read_config(asterisk_t)
--
- userdom_dontaudit_use_unpriv_user_fds(asterisk_t)
- userdom_dontaudit_search_user_home_dirs(asterisk_t)
-
- optional_policy(`
-- nis_use_ypbind(asterisk_t)
-+ mysql_stream_connect(asterisk_t)
-+')
-+
-+optional_policy(`
-+ mta_send_mail(asterisk_t)
-+')
-+
-+optional_policy(`
-+ postfix_domtrans_postdrop(asterisk_t)
-+')
-+
-+optional_policy(`
-+ postgresql_stream_connect(asterisk_t)
- ')
-
- optional_policy(`
-@@ -138,10 +160,11 @@
- ')
-
- optional_policy(`
-- udev_read_db(asterisk_t)
-+ snmp_read_snmp_var_lib_files(asterisk_t)
-+ snmp_stream_connect(asterisk_t)
- ')
-
--ifdef(`TODO',`
--allow initrc_t asterisk_var_run_t:fifo_file unlink;
--allow sysadm_t asterisk_t:unix_stream_socket { connectto rw_stream_socket_perms };
-+optional_policy(`
-+ udev_read_db(asterisk_t)
- ')
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.fc serefpolicy-3.7.15/policy/modules/services/avahi.fc
---- nsaserefpolicy/policy/modules/services/avahi.fc 2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/avahi.fc 2010-03-18 10:44:43.000000000 -0400
-@@ -6,4 +6,4 @@
-
- /var/run/avahi-daemon(/.*)? gen_context(system_u:object_r:avahi_var_run_t,s0)
-
--/usr/lib/avahi-autoipd(/.*) gen_context(system_u:object_r:avahi_var_lib_t,s0)
-+/var/lib/avahi-autoipd(/.*)? gen_context(system_u:object_r:avahi_var_lib_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.if serefpolicy-3.7.15/policy/modules/services/avahi.if
---- nsaserefpolicy/policy/modules/services/avahi.if 2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/avahi.if 2010-03-18 10:44:43.000000000 -0400
-@@ -90,6 +90,7 @@
- class dbus send_msg;
- ')
-
-+ allow avahi_t $1:file read;
- allow $1 avahi_t:dbus send_msg;
- allow avahi_t $1:dbus send_msg;
- ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-3.7.15/policy/modules/services/avahi.te
---- nsaserefpolicy/policy/modules/services/avahi.te 2010-01-11 09:40:36.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/avahi.te 2010-03-18 10:44:43.000000000 -0400
-@@ -24,7 +24,7 @@
- # Local policy
- #
-
--allow avahi_t self:capability { dac_override setgid chown fowner kill net_admin setuid sys_chroot };
-+allow avahi_t self:capability { dac_override setgid chown fowner kill net_admin net_raw setuid sys_chroot };
- dontaudit avahi_t self:capability sys_tty_config;
- allow avahi_t self:process { setrlimit signal_perms getcap setcap };
- allow avahi_t self:fifo_file rw_fifo_file_perms;
-@@ -32,6 +32,7 @@
- allow avahi_t self:unix_dgram_socket create_socket_perms;
- allow avahi_t self:tcp_socket create_stream_socket_perms;
- allow avahi_t self:udp_socket create_socket_perms;
-+allow avahi_t self:packet_socket create_socket_perms;
-
- manage_dirs_pattern(avahi_t, avahi_var_lib_t, avahi_var_lib_t)
- manage_files_pattern(avahi_t, avahi_var_lib_t, avahi_var_lib_t)
-@@ -42,11 +43,13 @@
- allow avahi_t avahi_var_run_t:dir setattr;
- files_pid_filetrans(avahi_t, avahi_var_run_t, file)
-
-+kernel_read_system_state(avahi_t)
- kernel_read_kernel_sysctls(avahi_t)
--kernel_list_proc(avahi_t)
--kernel_read_proc_symlinks(avahi_t)
- kernel_read_network_state(avahi_t)
-
-+corecmd_exec_bin(avahi_t)
-+corecmd_exec_shell(avahi_t)
-+
- corenet_all_recvfrom_unlabeled(avahi_t)
- corenet_all_recvfrom_netlabel(avahi_t)
- corenet_tcp_sendrecv_generic_if(avahi_t)
-@@ -85,6 +88,10 @@
- miscfiles_read_localization(avahi_t)
- miscfiles_read_certs(avahi_t)
-
-+sysnet_domtrans_ifconfig(avahi_t)
-+sysnet_manage_config(avahi_t)
-+sysnet_etc_filetrans_config(avahi_t)
-+
- userdom_dontaudit_use_unpriv_user_fds(avahi_t)
- userdom_dontaudit_search_user_home_dirs(avahi_t)
-
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.if serefpolicy-3.7.15/policy/modules/services/bind.if
---- nsaserefpolicy/policy/modules/services/bind.if 2010-02-12 10:33:09.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/bind.if 2010-03-18 10:44:43.000000000 -0400
-@@ -253,7 +253,7 @@
-
- ########################################
- ##
--## Do not audit attempts to set the attributes
-+## Allow domain to set the attributes
- ## of the BIND pid directory.
- ##
- ##
-@@ -272,6 +272,25 @@
-
- ########################################
- ##
-+## Allow domain to set attributes
-+## of the BIND zone directory.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`bind_setattr_zone_dirs',`
-+ gen_require(`
-+ type named_zone_t;
-+ ')
-+
-+ allow $1 named_zone_t:dir setattr;
-+')
-+
-+########################################
-+##
- ## Read BIND zone files.
- ##
- ##
-@@ -356,7 +375,7 @@
-
- bind_run_ndc($1, $2)
-
-- init_labeled_script_domtrans($1, bind_initrc_exec_t)
-+ init_labeled_script_domtrans($1, named_initrc_exec_t)
- domain_system_change_exemption($1)
- role_transition $2 named_initrc_exec_t system_r;
- allow $2 system_r;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.te serefpolicy-3.7.15/policy/modules/services/bind.te
---- nsaserefpolicy/policy/modules/services/bind.te 2010-02-12 10:33:09.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/bind.te 2010-03-18 10:44:43.000000000 -0400
-@@ -142,11 +142,11 @@
-
- logging_send_syslog_msg(named_t)
-
-+init_read_script_tmp_files(named_t)
-+
- miscfiles_read_localization(named_t)
- miscfiles_read_certs(named_t)
-
--sysnet_read_config(named_t)
--
- userdom_dontaudit_use_unpriv_user_fds(named_t)
- userdom_dontaudit_search_user_home_dirs(named_t)
-
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-3.7.15/policy/modules/services/bluetooth.te
---- nsaserefpolicy/policy/modules/services/bluetooth.te 2010-02-12 10:33:09.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/bluetooth.te 2010-03-18 10:44:43.000000000 -0400
-@@ -54,7 +54,7 @@
- # Bluetooth services local policy
- #
-
--allow bluetooth_t self:capability { dac_override net_bind_service net_admin net_raw setpcap sys_tty_config ipc_lock };
-+allow bluetooth_t self:capability { dac_override net_bind_service net_admin net_raw setpcap sys_admin sys_tty_config ipc_lock };
- dontaudit bluetooth_t self:capability sys_tty_config;
- allow bluetooth_t self:process { getcap setcap getsched signal_perms };
- allow bluetooth_t self:fifo_file rw_fifo_file_perms;
-@@ -96,6 +96,7 @@
- kernel_read_system_state(bluetooth_t)
- kernel_read_network_state(bluetooth_t)
- kernel_request_load_module(bluetooth_t)
-+kernel_search_debugfs(bluetooth_t)
-
- corenet_all_recvfrom_unlabeled(bluetooth_t)
- corenet_all_recvfrom_netlabel(bluetooth_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/boinc.fc serefpolicy-3.7.15/policy/modules/services/boinc.fc
---- nsaserefpolicy/policy/modules/services/boinc.fc 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/boinc.fc 2010-03-18 10:44:43.000000000 -0400
-@@ -0,0 +1,6 @@
-+
-+/etc/rc\.d/init\.d/boinc_client -- gen_context(system_u:object_r:boinc_initrc_exec_t,s0)
-+
-+/usr/bin/boinc_client -- gen_context(system_u:object_r:boinc_exec_t,s0)
-+
-+/var/lib/boinc(/.*)? gen_context(system_u:object_r:boinc_var_lib_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/boinc.if serefpolicy-3.7.15/policy/modules/services/boinc.if
---- nsaserefpolicy/policy/modules/services/boinc.if 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/boinc.if 2010-03-18 10:44:43.000000000 -0400
-@@ -0,0 +1,151 @@
-+
-+## policy for boinc
-+
-+########################################
-+##
-+## Execute a domain transition to run boinc.
-+##
-+##
-+##
-+## Domain allowed to transition.
-+##
-+##
-+#
-+interface(`boinc_domtrans',`
-+ gen_require(`
-+ type boinc_t, boinc_exec_t;
-+ ')
-+
-+ domtrans_pattern($1, boinc_exec_t, boinc_t)
-+')
-+
-+#######################################
-+##
-+## Execute boinc server in the boinc domain.
-+##
-+##
-+##
-+## The type of the process performing this action.
-+##
-+##
-+#
-+interface(`boinc_initrc_domtrans',`
-+ gen_require(`
-+ type boinc_initrc_exec_t;
-+ ')
-+
-+ init_labeled_script_domtrans($1, boinc_initrc_exec_t)
-+')
-+
-+########################################
-+##
-+## Search boinc lib directories.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`boinc_search_lib',`
-+ gen_require(`
-+ type boinc_var_lib_t;
-+ ')
-+
-+ allow $1 boinc_var_lib_t:dir search_dir_perms;
-+ files_search_var_lib($1)
-+')
-+
-+########################################
-+##
-+## Read boinc lib files.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`boinc_read_lib_files',`
-+ gen_require(`
-+ type boinc_var_lib_t;
-+ ')
-+
-+ files_search_var_lib($1)
-+ read_files_pattern($1, boinc_var_lib_t, boinc_var_lib_t)
-+')
-+
-+########################################
-+##
-+## Create, read, write, and delete
-+## boinc lib files.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`boinc_manage_lib_files',`
-+ gen_require(`
-+ type boinc_var_lib_t;
-+ ')
-+
-+ files_search_var_lib($1)
-+ manage_files_pattern($1, boinc_var_lib_t, boinc_var_lib_t)
-+')
-+
-+########################################
-+##
-+## Manage boinc var_lib files.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`boinc_manage_var_lib',`
-+ gen_require(`
-+ type boinc_var_lib_t;
-+ ')
-+
-+ manage_dirs_pattern($1, boinc_var_lib_t, boinc_var_lib_t)
-+ manage_files_pattern($1, boinc_var_lib_t, boinc_var_lib_t)
-+ manage_lnk_files_pattern($1, boinc_var_lib_t, boinc_var_lib_t)
-+')
-+
-+########################################
-+##
-+## All of the rules required to administrate
-+## an boinc environment.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+##
-+##
-+## Role allowed access.
-+##
-+##
-+##
-+#
-+interface(`boinc_admin',`
-+ gen_require(`
-+ type boinc_t, boinc_initrc_exec_t;
-+ type boinc_var_lib_t;
-+ ')
-+
-+ allow $1 boinc_t:process { ptrace signal_perms getattr };
-+ read_files_pattern($1, boinc_t, boinc_t)
-+
-+ boinc_initrc_domtrans($1)
-+ domain_system_change_exemption($1)
-+ role_transition $2 myboinc_initrc_exec_t system_r;
-+ allow $2 system_r;
-+
-+ files_list_var_lib($1)
-+ admin_pattern($1, boinc_var_lib_t)
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/boinc.te serefpolicy-3.7.15/policy/modules/services/boinc.te
---- nsaserefpolicy/policy/modules/services/boinc.te 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/boinc.te 2010-03-18 10:44:43.000000000 -0400
-@@ -0,0 +1,80 @@
-+
-+policy_module(boinc,1.0.0)
-+
-+########################################
-+#
-+# Declarations
-+#
-+
-+type boinc_t;
-+type boinc_exec_t;
-+init_daemon_domain(boinc_t, boinc_exec_t)
-+
-+permissive boinc_t;
-+
-+type boinc_initrc_exec_t;
-+init_script_file(boinc_initrc_exec_t)
-+
-+type boinc_tmpfs_t;
-+files_tmpfs_file(boinc_tmpfs_t)
-+
-+type boinc_var_lib_t;
-+files_type(boinc_var_lib_t)
-+
-+########################################
-+#
-+# boinc local policy
-+#
-+
-+allow boinc_t self:capability { kill };
-+allow boinc_t self:process { execmem fork setsched signal };
-+
-+allow boinc_t self:fifo_file rw_fifo_file_perms;
-+allow boinc_t self:unix_stream_socket create_stream_socket_perms;
-+allow boinc_t self:tcp_socket create_stream_socket_perms;
-+allow boinc_t self:shm create_shm_perms;
-+
-+manage_files_pattern(boinc_t, boinc_tmpfs_t, boinc_tmpfs_t)
-+fs_tmpfs_filetrans(boinc_t, boinc_tmpfs_t,file)
-+
-+exec_files_pattern(boinc_t, boinc_var_lib_t, boinc_var_lib_t)
-+manage_dirs_pattern(boinc_t, boinc_var_lib_t, boinc_var_lib_t)
-+manage_files_pattern(boinc_t, boinc_var_lib_t, boinc_var_lib_t)
-+files_var_lib_filetrans(boinc_t, boinc_var_lib_t, { file dir } )
-+
-+kernel_read_system_state(boinc_t)
-+kernel_read_kernel_sysctls(boinc_t)
-+
-+corecmd_exec_bin(boinc_t)
-+corecmd_exec_shell(boinc_t)
-+
-+corenet_all_recvfrom_unlabeled(boinc_t)
-+corenet_all_recvfrom_netlabel(boinc_t)
-+corenet_tcp_sendrecv_generic_if(boinc_t)
-+corenet_udp_sendrecv_generic_if(boinc_t)
-+corenet_tcp_sendrecv_generic_node(boinc_t)
-+corenet_udp_sendrecv_generic_node(boinc_t)
-+corenet_tcp_sendrecv_all_ports(boinc_t)
-+corenet_udp_sendrecv_all_ports(boinc_t)
-+corenet_tcp_bind_generic_node(boinc_t)
-+corenet_udp_bind_generic_node(boinc_t)
-+corenet_tcp_bind_boinc_port(boinc_t)
-+corenet_tcp_connect_http_port(boinc_t)
-+
-+dev_read_urand(boinc_t)
-+
-+domain_read_all_domains_state(boinc_t)
-+
-+files_read_etc_files(boinc_t)
-+files_read_usr_files(boinc_t)
-+
-+fs_getattr_all_fs(boinc_t)
-+
-+term_dontaudit_getattr_ptmx(boinc_t)
-+
-+miscfiles_read_localization(boinc_t)
-+
-+logging_send_syslog_msg(boinc_t)
-+
-+sysnet_dns_name_resolve(boinc_t)
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cachefilesd.fc serefpolicy-3.7.15/policy/modules/services/cachefilesd.fc
---- nsaserefpolicy/policy/modules/services/cachefilesd.fc 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/cachefilesd.fc 2010-03-18 10:44:43.000000000 -0400
-@@ -0,0 +1,28 @@
-+###############################################################################
-+#
-+# Copyright (C) 2006 Red Hat, Inc. All Rights Reserved.
-+# Written by David Howells (dhowells@redhat.com)
-+# Karl MacMillan (kmacmill@redhat.com)
-+#
-+# This program is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License
-+# as published by the Free Software Foundation; either version
-+# 2 of the License, or (at your option) any later version.
-+#
-+###############################################################################
-+
-+#
-+# Define the contexts to be assigned to various files and directories of
-+# importance to the CacheFiles kernel module and userspace management daemon.
-+#
-+
-+# cachefilesd executable will have:
-+# label: system_u:object_r:cachefilesd_exec_t
-+# MLS sensitivity: s0
-+# MCS categories:
-+
-+/sbin/cachefilesd -- gen_context(system_u:object_r:cachefilesd_exec_t,s0)
-+/dev/cachefiles -c gen_context(system_u:object_r:cachefiles_dev_t,s0)
-+/var/fscache(/.*)? gen_context(system_u:object_r:cachefiles_var_t,s0)
-+
-+/var/run/cachefilesd\.pid -- gen_context(system_u:object_r:cachefiles_var_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cachefilesd.if serefpolicy-3.7.15/policy/modules/services/cachefilesd.if
---- nsaserefpolicy/policy/modules/services/cachefilesd.if 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/cachefilesd.if 2010-03-18 10:44:43.000000000 -0400
-@@ -0,0 +1,41 @@
-+###############################################################################
-+#
-+# Copyright (C) 2006 Red Hat, Inc. All Rights Reserved.
-+# Written by David Howells (dhowells@redhat.com)
-+# Karl MacMillan (kmacmill@redhat.com)
-+#
-+# This program is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License
-+# as published by the Free Software Foundation; either version
-+# 2 of the License, or (at your option) any later version.
-+#
-+###############################################################################
-+
-+#
-+# Define the policy interface for the CacheFiles userspace management daemon.
-+#
-+
-+## policy for cachefilesd
-+
-+########################################
-+##
-+## Execute a domain transition to run cachefilesd.
-+##
-+##
-+##
-+## Domain allowed to transition.
-+##
-+##
-+#
-+interface(`cachefilesd_domtrans',`
-+ gen_require(`
-+ type cachefilesd_t, cachefilesd_exec_t;
-+ ')
-+
-+ domain_auto_trans($1,cachefilesd_exec_t,cachefilesd_t)
-+
-+ allow $1 cachefilesd_t:fd use;
-+ allow cachefilesd_t $1:fd use;
-+ allow cachefilesd_t $1:fifo_file rw_file_perms;
-+ allow cachefilesd_t $1:process sigchld;
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cachefilesd.te serefpolicy-3.7.15/policy/modules/services/cachefilesd.te
---- nsaserefpolicy/policy/modules/services/cachefilesd.te 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/cachefilesd.te 2010-03-18 10:44:43.000000000 -0400
-@@ -0,0 +1,146 @@
-+###############################################################################
-+#
-+# Copyright (C) 2006, 2010 Red Hat, Inc. All Rights Reserved.
-+# Written by David Howells (dhowells@redhat.com)
-+# Karl MacMillan (kmacmill@redhat.com)
-+#
-+# This program is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License
-+# as published by the Free Software Foundation; either version
-+# 2 of the License, or (at your option) any later version.
-+#
-+###############################################################################
-+
-+#
-+# This security policy governs access by the CacheFiles kernel module and
-+# userspace management daemon to the files and directories in the on-disk
-+# cache, on behalf of the processes accessing the cache through a network
-+# filesystem such as NFS
-+#
-+policy_module(cachefilesd,1.0.17)
-+
-+###############################################################################
-+#
-+# Declarations
-+#
-+require { type kernel_t; }
-+
-+#
-+# Files in the cache are created by the cachefiles module with security ID
-+# cachefiles_var_t
-+#
-+type cachefiles_var_t;
-+files_type(cachefiles_var_t)
-+
-+#
-+# The /dev/cachefiles character device has security ID cachefiles_dev_t
-+#
-+type cachefiles_dev_t;
-+dev_node(cachefiles_dev_t)
-+
-+#
-+# The cachefilesd daemon normally runs with security ID cachefilesd_t
-+#
-+type cachefilesd_t;
-+type cachefilesd_exec_t;
-+domain_type(cachefilesd_t)
-+init_daemon_domain(cachefilesd_t, cachefilesd_exec_t)
-+
-+#
-+# The cachefilesd daemon pid file context
-+#
-+type cachefilesd_var_run_t;
-+files_pid_file(cachefilesd_var_run_t)
-+
-+#
-+# The CacheFiles kernel module causes processes accessing the cache files to do
-+# so acting as security ID cachefiles_kernel_t
-+#
-+type cachefiles_kernel_t;
-+domain_type(cachefiles_kernel_t)
-+domain_obj_id_change_exemption(cachefiles_kernel_t)
-+role system_r types cachefiles_kernel_t;
-+
-+###############################################################################
-+#
-+# Permit RPM to deal with files in the cache
-+#
-+rpm_use_script_fds(cachefilesd_t)
-+
-+###############################################################################
-+#
-+# cachefilesd local policy
-+#
-+# These define what cachefilesd is permitted to do. This doesn't include very
-+# much: startup stuff, logging, pid file, scanning the cache superstructure and
-+# deleting files from the cache. It is not permitted to read/write files in
-+# the cache.
-+#
-+# Check in /usr/share/selinux/devel/include/ for macros to use instead of allow
-+# rules.
-+#
-+allow cachefilesd_t self : capability { setuid setgid sys_admin dac_override };
-+
-+# Basic access
-+files_read_etc_files(cachefilesd_t)
-+libs_use_ld_so(cachefilesd_t)
-+libs_use_shared_libs(cachefilesd_t)
-+miscfiles_read_localization(cachefilesd_t)
-+logging_send_syslog_msg(cachefilesd_t)
-+init_dontaudit_use_script_ptys(cachefilesd_t)
-+term_dontaudit_use_generic_ptys(cachefilesd_t)
-+term_dontaudit_getattr_unallocated_ttys(cachefilesd_t)
-+
-+# Allow manipulation of pid file
-+allow cachefilesd_t cachefilesd_var_run_t:file create_file_perms;
-+manage_files_pattern(cachefilesd_t,cachefilesd_var_run_t, cachefilesd_var_run_t)
-+manage_dirs_pattern(cachefilesd_t,cachefilesd_var_run_t, cachefilesd_var_run_t)
-+files_pid_file(cachefilesd_var_run_t)
-+files_pid_filetrans(cachefilesd_t,cachefilesd_var_run_t,file)
-+
-+# Allow access to cachefiles device file
-+allow cachefilesd_t cachefiles_dev_t : chr_file rw_file_perms;
-+
-+# Allow access to cache superstructure
-+allow cachefilesd_t cachefiles_var_t : dir rw_dir_perms;
-+allow cachefilesd_t cachefiles_var_t : file { getattr rename unlink };
-+
-+# Permit statfs on the backing filesystem
-+fs_getattr_xattr_fs(cachefilesd_t)
-+
-+###############################################################################
-+#
-+# When cachefilesd invokes the kernel module to begin caching, it has to tell
-+# the kernel module the security context in which it should act, and this
-+# policy has to approve that.
-+#
-+# There are two parts to this:
-+#
-+# (1) the security context used by the module to access files in the cache,
-+# as set by the 'secctx' command in /etc/cachefilesd.conf, and
-+#
-+allow cachefilesd_t cachefiles_kernel_t : kernel_service { use_as_override };
-+
-+#
-+# (2) the label that will be assigned to new files and directories created in
-+# the cache by the module, which will be the same as the label on the
-+# directory pointed to by the 'dir' command.
-+#
-+allow cachefilesd_t cachefiles_var_t : kernel_service { create_files_as };
-+
-+###############################################################################
-+#
-+# cachefiles kernel module local policy
-+#
-+# This governs what the kernel module is allowed to do the contents of the
-+# cache.
-+#
-+allow cachefiles_kernel_t self:capability { dac_override dac_read_search };
-+allow cachefiles_kernel_t initrc_t:process sigchld;
-+
-+manage_dirs_pattern(cachefiles_kernel_t,cachefiles_var_t, cachefiles_var_t)
-+manage_files_pattern(cachefiles_kernel_t,cachefiles_var_t, cachefiles_var_t)
-+
-+fs_getattr_xattr_fs(cachefiles_kernel_t)
-+
-+dev_search_sysfs(cachefiles_kernel_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ccs.te serefpolicy-3.7.15/policy/modules/services/ccs.te
---- nsaserefpolicy/policy/modules/services/ccs.te 2010-02-16 14:58:22.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/ccs.te 2010-03-18 10:44:43.000000000 -0400
-@@ -114,5 +114,10 @@
- ')
-
- optional_policy(`
-+ aisexec_stream_connect(ccs_t)
-+ corosync_stream_connect(ccs_t)
-+')
-+
-+optional_policy(`
- unconfined_use_fds(ccs_t)
- ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/certmonger.fc serefpolicy-3.7.15/policy/modules/services/certmonger.fc
---- nsaserefpolicy/policy/modules/services/certmonger.fc 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/certmonger.fc 2010-03-18 10:44:43.000000000 -0400
-@@ -0,0 +1,6 @@
-+/etc/rc\.d/init\.d/certmonger -- gen_context(system_u:object_r:certmonger_initrc_exec_t,s0)
-+
-+/usr/sbin/certmonger -- gen_context(system_u:object_r:certmonger_exec_t,s0)
-+
-+/var/run/certmonger.pid -- gen_context(system_u:object_r:certmonger_var_run_t,s0)
-+/var/lib/certmonger(/.*)? gen_context(system_u:object_r:certmonger_var_lib_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/certmonger.if serefpolicy-3.7.15/policy/modules/services/certmonger.if
---- nsaserefpolicy/policy/modules/services/certmonger.if 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/certmonger.if 2010-03-18 10:44:43.000000000 -0400
-@@ -0,0 +1,217 @@
-+
-+## Certificate status monitor and PKI enrollment client
-+
-+########################################
-+##
-+## Execute a domain transition to run certmonger.
-+##
-+##
-+##
-+## Domain allowed to transition.
-+##
-+##
-+#
-+interface(`certmonger_domtrans',`
-+ gen_require(`
-+ type certmonger_t, certmonger_exec_t;
-+ ')
-+
-+ domtrans_pattern($1, certmonger_exec_t, certmonger_t)
-+')
-+
-+
-+########################################
-+##
-+## Execute certmonger server in the certmonger domain.
-+##
-+##
-+##
-+## The type of the process performing this action.
-+##
-+##
-+#
-+interface(`certmonger_initrc_domtrans',`
-+ gen_require(`
-+ type certmonger_initrc_exec_t;
-+ ')
-+
-+ init_labeled_script_domtrans($1, certmonger_initrc_exec_t)
-+')
-+
-+########################################
-+##
-+## Read certmonger PID files.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`certmonger_read_pid_files',`
-+ gen_require(`
-+ type certmonger_var_run_t;
-+ ')
-+
-+ files_search_pids($1)
-+ allow $1 certmonger_var_run_t:file read_file_perms;
-+')
-+
-+########################################
-+##
-+## Manage certmonger var_run files.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`certmonger_manage_var_run',`
-+ gen_require(`
-+ type certmonger_var_run_t;
-+ ')
-+
-+ manage_dirs_pattern($1, certmonger_var_run_t, certmonger_var_run_t)
-+ manage_files_pattern($1, certmonger_var_run_t, certmonger_var_run_t)
-+ manage_lnk_files_pattern($1, certmonger_var_run_t, certmonger_var_run_t)
-+')
-+
-+
-+########################################
-+##
-+## Search certmonger lib directories.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`certmonger_search_lib',`
-+ gen_require(`
-+ type certmonger_var_lib_t;
-+ ')
-+
-+ allow $1 certmonger_var_lib_t:dir search_dir_perms;
-+ files_search_var_lib($1)
-+')
-+
-+########################################
-+##
-+## Read certmonger lib files.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`certmonger_read_lib_files',`
-+ gen_require(`
-+ type certmonger_var_lib_t;
-+ ')
-+
-+ files_search_var_lib($1)
-+ read_files_pattern($1, certmonger_var_lib_t, certmonger_var_lib_t)
-+')
-+
-+########################################
-+##
-+## Create, read, write, and delete
-+## certmonger lib files.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`certmonger_manage_lib_files',`
-+ gen_require(`
-+ type certmonger_var_lib_t;
-+ ')
-+
-+ files_search_var_lib($1)
-+ manage_files_pattern($1, certmonger_var_lib_t, certmonger_var_lib_t)
-+')
-+
-+########################################
-+##
-+## Manage certmonger var_lib files.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`certmonger_manage_var_lib',`
-+ gen_require(`
-+ type certmonger_var_lib_t;
-+ ')
-+
-+ manage_dirs_pattern($1, certmonger_var_lib_t, certmonger_var_lib_t)
-+ manage_files_pattern($1, certmonger_var_lib_t, certmonger_var_lib_t)
-+ manage_lnk_files_pattern($1, certmonger_var_lib_t, certmonger_var_lib_t)
-+')
-+
-+
-+########################################
-+##
-+## Send and receive messages from
-+## certmonger over dbus.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`certmonger_dbus_chat',`
-+ gen_require(`
-+ type certmonger_t;
-+ class dbus send_msg;
-+ ')
-+
-+ allow $1 certmonger_t:dbus send_msg;
-+ allow certmonger_t $1:dbus send_msg;
-+')
-+
-+########################################
-+##
-+## All of the rules required to administrate
-+## an certmonger environment
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+##
-+##
-+## Role allowed access.
-+##
-+##
-+##
-+#
-+interface(`certmonger_admin',`
-+ gen_require(`
-+ type certmonger_t, certmonger_initrc_exec_t;
-+ ')
-+
-+ allow $1 certmonger_t:process { ptrace signal_perms getattr };
-+ read_files_pattern($1, certmonger_t, certmonger_t)
-+
-+ # Allow certmonger_t to restart the apache service
-+ certmonger_initrc_domtrans($1)
-+ domain_system_change_exemption($1)
-+ role_transition $2 certmonger_initrc_exec_t system_r;
-+ allow $2 system_r;
-+
-+ files_search_var_lib($1)
-+ admin_pattern($1, cermonger_var_lib_t)
-+
-+ files_search_pids($1)
-+ admin_pattern($1, cermonger_var_run_t)
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/certmonger.te serefpolicy-3.7.15/policy/modules/services/certmonger.te
---- nsaserefpolicy/policy/modules/services/certmonger.te 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/certmonger.te 2010-03-18 10:44:43.000000000 -0400
-@@ -0,0 +1,74 @@
-+policy_module(certmonger,1.0.0)
-+
-+########################################
-+#
-+# Declarations
-+#
-+
-+type certmonger_t;
-+type certmonger_exec_t;
-+init_daemon_domain(certmonger_t, certmonger_exec_t)
-+
-+permissive certmonger_t;
-+
-+type certmonger_initrc_exec_t;
-+init_script_file(certmonger_initrc_exec_t)
-+
-+type certmonger_var_run_t;
-+files_pid_file(certmonger_var_run_t)
-+
-+type certmonger_var_lib_t;
-+files_type(certmonger_var_lib_t)
-+
-+########################################
-+#
-+# certmonger local policy
-+#
-+
-+allow certmonger_t self:capability { kill sys_nice };
-+allow certmonger_t self:process { fork getsched setsched sigkill };
-+allow certmonger_t self:fifo_file rw_file_perms;
-+allow certmonger_t self:unix_stream_socket create_stream_socket_perms;
-+allow certmonger_t self:tcp_socket create_stream_socket_perms;
-+allow certmonger_t self:netlink_route_socket r_netlink_socket_perms;
-+
-+manage_dirs_pattern(certmonger_t, certmonger_var_run_t, certmonger_var_run_t)
-+manage_files_pattern(certmonger_t, certmonger_var_run_t, certmonger_var_run_t)
-+files_pid_filetrans(certmonger_t, certmonger_var_run_t, { file dir })
-+
-+manage_dirs_pattern(certmonger_t, certmonger_var_lib_t, certmonger_var_lib_t)
-+manage_files_pattern(certmonger_t, certmonger_var_lib_t, certmonger_var_lib_t)
-+files_var_lib_filetrans(certmonger_t, certmonger_var_lib_t, { file dir } )
-+
-+domain_use_interactive_fds(certmonger_t)
-+
-+corenet_tcp_sendrecv_generic_if(certmonger_t)
-+corenet_tcp_sendrecv_generic_node(certmonger_t)
-+corenet_tcp_sendrecv_all_ports(certmonger_t)
-+corenet_tcp_connect_certmaster_port(certmonger_t)
-+
-+dev_read_urand(certmonger_t)
-+
-+files_read_etc_files(certmonger_t)
-+files_read_usr_files(certmonger_t)
-+files_list_tmp(certmonger_t)
-+
-+miscfiles_read_localization(certmonger_t)
-+miscfiles_manage_cert_files(certmonger_t)
-+
-+logging_send_syslog_msg(certmonger_t)
-+
-+sysnet_dns_name_resolve(certmonger_t)
-+
-+optional_policy(`
-+ dbus_system_bus_client(certmonger_t)
-+ dbus_connect_system_bus(certmonger_t)
-+')
-+
-+optional_policy(`
-+ kerberos_use(certmonger_t)
-+')
-+
-+optional_policy(`
-+ unconfined_dbus_send(certmonger_t)
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cgroup.fc serefpolicy-3.7.15/policy/modules/services/cgroup.fc
---- nsaserefpolicy/policy/modules/services/cgroup.fc 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/cgroup.fc 2010-03-18 10:44:43.000000000 -0400
-@@ -0,0 +1,7 @@
-+/etc/rc\.d/init\.d/cgconfig -- gen_context(system_u:object_r:cgconfig_initrc_exec_t, s0)
-+/etc/rc\.d/init\.d/cgred -- gen_context(system_u:object_r:cgred_initrc_exec_t, s0)
-+
-+/sbin/cgrulesengd -- gen_context(system_u:object_r:cgred_exec_t, s0)
-+/sbin/cgconfigparser -- gen_context(system_u:object_r:cgconfigparser_exec_t, s0)
-+
-+/var/run/cgred.* gen_context(system_u:object_r:cgred_var_run_t, s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cgroup.if serefpolicy-3.7.15/policy/modules/services/cgroup.if
---- nsaserefpolicy/policy/modules/services/cgroup.if 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/cgroup.if 2010-03-18 10:44:43.000000000 -0400
-@@ -0,0 +1,35 @@
-+## Control group rules engine daemon.
-+##
-+##
-+## cgrulesengd is a daemon, which distributes processes
-+## to control groups. When any process changes its
-+## effective UID or GID, cgred inspects list of
-+## rules loaded from cgrules.conf file and moves the
-+## process to the appropriate control group.
-+##
-+##
-+## The list of rules is read during the daemon startup and
-+## are cached in daemons memory. The daemon reloads the
-+## list of rules when it receives SIGUSR2 signal.
-+##
-+##
-+
-+########################################
-+##
-+## Read and write cgred sock file in /var/run.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`cgroup_stream_connect', `
-+ gen_require(`
-+ type cgred_var_run_t, cgred_t;
-+ ')
-+
-+ files_search_pids($1)
-+ stream_connect_pattern($1, cgred_var_run_t, cgred_var_run_t, cgred_t)
-+')
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cgroup.te serefpolicy-3.7.15/policy/modules/services/cgroup.te
---- nsaserefpolicy/policy/modules/services/cgroup.te 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/cgroup.te 2010-03-18 10:44:43.000000000 -0400
-@@ -0,0 +1,87 @@
-+policy_module(cgroup, 1.0.0)
-+
-+########################################
-+#
-+# cgred personal declarations.
-+#
-+
-+type cgred_t;
-+type cgred_exec_t;
-+init_daemon_domain(cgred_t, cgred_exec_t)
-+
-+type cgred_initrc_exec_t;
-+init_script_file(cgred_initrc_exec_t)
-+
-+type cgred_var_run_t;
-+files_pid_file(cgred_var_run_t)
-+
-+########################################
-+#
-+# cgconfig personal declarations.
-+#
-+
-+type cgconfigparser_t;
-+type cgconfigparser_exec_t;
-+init_daemon_domain(cgconfigparser_t, cgconfigparser_exec_t)
-+
-+type cgconfig_initrc_exec_t;
-+init_script_file(cgconfig_initrc_exec_t)
-+
-+permissive cgconfigparser_t;
-+permissive cgred_t;
-+
-+########################################
-+#
-+# cgred personal policy.
-+#
-+
-+allow cgred_t self:capability { net_admin sys_ptrace dac_override };
-+allow cgred_t self:netlink_socket { write bind create read };
-+allow cgred_t self:unix_dgram_socket { write create connect };
-+
-+manage_sock_files_pattern(cgred_t, cgred_var_run_t,
-+cgred_var_run_t)
-+files_pid_filetrans(cgred_t, cgred_var_run_t, sock_file)
-+
-+domain_read_all_domains_state(cgred_t)
-+
-+files_read_etc_files(cgred_t)
-+
-+files_search_all(cgred_t)
-+files_getattr_all_files(cgred_t)
-+files_getattr_all_dirs(cgred_t)
-+files_getattr_all_sockets(cgred_t)
-+files_getattr_all_pipes(cgred_t)
-+files_getattr_all_symlinks(cgred_t)
-+# read all link files.
-+
-+kernel_read_system_state(cgred_t)
-+
-+logging_send_syslog_msg(cgred_t)
-+
-+miscfiles_read_localization(cgred_t)
-+
-+optional_policy(`
-+ fs_write_cgroup_files(cgred_t)
-+')
-+
-+########################################
-+#
-+# cgconfig personal policy.
-+#
-+
-+optional_policy(`
-+ fs_manage_cgroup_dirs(cgconfigparser_t)
-+ fs_rw_cgroup_files(cgconfigparser_t)
-+ fs_setattr_cgroup_files(cgconfigparser_t)
-+ fs_mount_cgroup(cgconfigparser_t)
-+')
-+
-+files_mounton_mnt(cgconfigparser_t)
-+files_manage_mnt_dirs(cgconfigparser_t)
-+
-+files_read_etc_files(cgconfigparser_t)
-+
-+# /mnt/cgroups/cpu
-+kernel_list_unlabeled(cgconfigparser_t)
-+kernel_read_system_state(cgconfigparser_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/chronyd.fc serefpolicy-3.7.15/policy/modules/services/chronyd.fc
---- nsaserefpolicy/policy/modules/services/chronyd.fc 2010-02-16 14:58:22.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/chronyd.fc 2010-03-18 10:44:43.000000000 -0400
-@@ -1,3 +1,5 @@
-+/etc/chrony\.keys -- gen_context(system_u:object_r:chronyd_keys_t,s0)
-+
- /etc/rc\.d/init\.d/chronyd -- gen_context(system_u:object_r:chronyd_initrc_exec_t,s0)
-
- /usr/sbin/chronyd -- gen_context(system_u:object_r:chronyd_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/chronyd.if serefpolicy-3.7.15/policy/modules/services/chronyd.if
---- nsaserefpolicy/policy/modules/services/chronyd.if 2010-02-16 14:58:22.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/chronyd.if 2010-03-18 10:44:43.000000000 -0400
-@@ -77,7 +77,7 @@
- gen_require(`
- type chronyd_t, chronyd_var_log_t;
- type chronyd_var_run_t, chronyd_var_lib_t;
-- type chronyd_initrc_exec_t;
-+ type chronyd_initrc_exec_t, chronyd_keys_t;
- ')
-
- allow $1 chronyd_t:process { ptrace signal_perms };
-@@ -88,6 +88,8 @@
- role_transition $2 chronyd_initrc_exec_t system_r;
- allow $2 system_r;
-
-+ admin_pattern($1, chronyd_keys_t)
-+
- logging_search_logs($1)
- admin_pattern($1, chronyd_var_log_t)
-
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/chronyd.te serefpolicy-3.7.15/policy/modules/services/chronyd.te
---- nsaserefpolicy/policy/modules/services/chronyd.te 2010-02-16 14:58:22.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/chronyd.te 2010-03-18 10:44:43.000000000 -0400
-@@ -13,6 +13,9 @@
- type chronyd_initrc_exec_t;
- init_script_file(chronyd_initrc_exec_t)
-
-+type chronyd_keys_t;
-+files_type(chronyd_keys_t)
-+
- type chronyd_var_lib_t;
- files_type(chronyd_var_lib_t)
-
-@@ -27,13 +30,17 @@
- # Local policy
- #
-
--allow chronyd_t self:capability { setuid setgid sys_time };
--allow chronyd_t self:process { getcap setcap };
--allow chronyd_t self:unix_dgram_socket create_socket_perms;
-+allow chronyd_t self:capability { dac_override ipc_lock setuid setgid sys_resource sys_time };
-+allow chronyd_t self:process { getcap setcap setrlimit };
-+allow chronyd_t self:shm create_shm_perms;
- allow chronyd_t self:udp_socket create_socket_perms;
-+allow chronyd_t self:unix_dgram_socket create_socket_perms;
-+
-+allow chronyd_t chronyd_keys_t:file read_file_perms;
-
- manage_files_pattern(chronyd_t, chronyd_var_lib_t, chronyd_var_lib_t)
- manage_dirs_pattern(chronyd_t, chronyd_var_lib_t, chronyd_var_lib_t)
-+manage_sock_files_pattern(chronyd_t, chronyd_var_lib_t, chronyd_var_lib_t)
- files_var_lib_filetrans(chronyd_t, chronyd_var_lib_t, { file dir })
-
- manage_files_pattern(chronyd_t, chronyd_var_log_t, chronyd_var_log_t)
-@@ -42,7 +49,7 @@
-
- manage_files_pattern(chronyd_t, chronyd_var_run_t, chronyd_var_run_t)
- manage_dirs_pattern(chronyd_t, chronyd_var_run_t, chronyd_var_run_t)
--files_pid_filetrans(chronyd_t, chronyd_var_run_t, { file })
-+files_pid_filetrans(chronyd_t, chronyd_var_run_t, file)
-
- corenet_udp_bind_ntp_port(chronyd_t)
- # bind to udp/323
-@@ -56,3 +63,7 @@
- logging_send_syslog_msg(chronyd_t)
-
- miscfiles_read_localization(chronyd_t)
-+
-+optional_policy(`
-+ gpsd_rw_shm(chronyd_t)
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.te serefpolicy-3.7.15/policy/modules/services/clamav.te
---- nsaserefpolicy/policy/modules/services/clamav.te 2010-01-07 14:53:53.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/clamav.te 2010-03-18 10:44:43.000000000 -0400
-@@ -57,6 +57,7 @@
- #
-
- allow clamd_t self:capability { kill setgid setuid dac_override };
-+dontaudit clamd_t self:capability sys_tty_config;
- allow clamd_t self:fifo_file rw_fifo_file_perms;
- allow clamd_t self:unix_stream_socket { create_stream_socket_perms connectto };
- allow clamd_t self:unix_dgram_socket create_socket_perms;
-@@ -189,10 +190,14 @@
-
- auth_use_nsswitch(freshclam_t)
-
-+logging_send_syslog_msg(freshclam_t)
-+
- miscfiles_read_localization(freshclam_t)
-
- clamav_stream_connect(freshclam_t)
-
-+userdom_stream_connect(freshclam_t)
-+
- optional_policy(`
- cron_system_entry(freshclam_t, freshclam_exec_t)
- ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clogd.fc serefpolicy-3.7.15/policy/modules/services/clogd.fc
---- nsaserefpolicy/policy/modules/services/clogd.fc 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/clogd.fc 2010-03-18 10:44:43.000000000 -0400
-@@ -0,0 +1,4 @@
-+
-+/usr/sbin/clogd -- gen_context(system_u:object_r:clogd_exec_t,s0)
-+
-+/var/run/clogd\.pid -- gen_context(system_u:object_r:clogd_var_run_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clogd.if serefpolicy-3.7.15/policy/modules/services/clogd.if
---- nsaserefpolicy/policy/modules/services/clogd.if 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/clogd.if 2010-03-18 10:44:43.000000000 -0400
-@@ -0,0 +1,82 @@
-+## clogd - clustered mirror log server
-+
-+######################################
-+##
-+## Execute a domain transition to run clogd.
-+##
-+##
-+##
-+## Domain allowed to transition.
-+##
-+##
-+#
-+interface(`clogd_domtrans',`
-+ gen_require(`
-+ type clogd_t, clogd_exec_t;
-+ ')
-+
-+ corecmd_search_bin($1)
-+ domtrans_pattern($1,clogd_exec_t,clogd_t)
-+
-+')
-+
-+#####################################
-+##
-+## Connect to clogd over a unix domain
-+## stream socket.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`clogd_stream_connect',`
-+ gen_require(`
-+ type clogd_t, clogd_var_run_t;
-+ ')
-+
-+ files_search_pids($1)
-+ stream_connect_pattern($1, clogd_var_run_t, clogd_var_run_t, clogd_t)
-+')
-+
-+#####################################
-+##
-+## Allow read and write access to clogd semaphores.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`clogd_rw_semaphores',`
-+ gen_require(`
-+ type clogd_t;
-+ ')
-+
-+ allow $1 clogd_t:sem { rw_sem_perms destroy };
-+')
-+
-+########################################
-+##
-+## Read and write to group shared memory.
-+##
-+##
-+##
-+## The type of the process performing this action.
-+##
-+##
-+#
-+interface(`clogd_rw_shm',`
-+ gen_require(`
-+ type clogd_t;
-+ ')
-+
-+ allow $1 clogd_t:shm { rw_shm_perms destroy };
-+ allow $1 clogd_tmpfs_t:dir list_dir_perms;
-+ rw_files_pattern($1, clogd_tmpfs_t, clogd_tmpfs_t)
-+ read_lnk_files_pattern($1, clogd_tmpfs_t, clogd_tmpfs_t)
-+ fs_search_tmpfs($1)
-+')
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clogd.te serefpolicy-3.7.15/policy/modules/services/clogd.te
---- nsaserefpolicy/policy/modules/services/clogd.te 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/clogd.te 2010-03-18 10:44:43.000000000 -0400
-@@ -0,0 +1,65 @@
-+
-+policy_module(clogd,1.0.0)
-+
-+########################################
-+#
-+# Declarations
-+#
-+
-+type clogd_t;
-+type clogd_exec_t;
-+init_daemon_domain(clogd_t, clogd_exec_t)
-+
-+type clogd_tmpfs_t;
-+files_tmpfs_file(clogd_tmpfs_t)
-+
-+# pid files
-+type clogd_var_run_t;
-+files_pid_file(clogd_var_run_t)
-+
-+permissive clogd_t;
-+
-+########################################
-+#
-+# clogd local policy
-+#
-+
-+allow clogd_t self:capability { net_admin mknod };
-+allow clogd_t self:process { signal };
-+
-+allow clogd_t self:sem create_sem_perms;
-+allow clogd_t self:shm create_shm_perms;
-+allow clogd_t self:netlink_socket create_socket_perms;
-+allow clogd_t self:unix_dgram_socket create_socket_perms;
-+
-+manage_dirs_pattern(clogd_t, clogd_tmpfs_t, clogd_tmpfs_t)
-+manage_files_pattern(clogd_t, clogd_tmpfs_t, clogd_tmpfs_t)
-+fs_tmpfs_filetrans(clogd_t, clogd_tmpfs_t,{ dir file })
-+
-+# pid files
-+manage_files_pattern(clogd_t, clogd_var_run_t, clogd_var_run_t)
-+manage_sock_files_pattern(clogd_t, clogd_var_run_t, clogd_var_run_t)
-+files_pid_filetrans(clogd_t,clogd_var_run_t, { file })
-+
-+dev_manage_generic_blk_files(clogd_t)
-+
-+storage_raw_read_fixed_disk(clogd_t)
-+storage_raw_write_fixed_disk(clogd_t)
-+
-+libs_use_ld_so(clogd_t)
-+libs_use_shared_libs(clogd_t)
-+
-+logging_send_syslog_msg(clogd_t)
-+
-+miscfiles_read_localization(clogd_t)
-+
-+optional_policy(`
-+ aisexec_stream_connect(clogd_t)
-+ corosync_stream_connect(clogd_t)
-+')
-+
-+optional_policy(`
-+ dev_read_lvm_control(clogd_t)
-+')
-+
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cobbler.if serefpolicy-3.7.15/policy/modules/services/cobbler.if
---- nsaserefpolicy/policy/modules/services/cobbler.if 2010-03-05 10:46:32.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/cobbler.if 2010-03-18 10:44:43.000000000 -0400
-@@ -173,9 +173,11 @@
- files_list_var_lib($1)
- admin_pattern($1, cobbler_var_lib_t)
-
-- files_search_var_log($1)
-+ logging_search_logs($1)
- admin_pattern($1, cobbler_var_log_t)
-
-+ admin_pattern($1, httpd_cobbler_content_rw_t)
-+
- cobblerd_initrc_domtrans($1)
- domain_system_change_exemption($1)
- role_transition $2 cobblerd_initrc_exec_t system_r;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cobbler.te serefpolicy-3.7.15/policy/modules/services/cobbler.te
---- nsaserefpolicy/policy/modules/services/cobbler.te 2010-02-12 10:33:09.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/cobbler.te 2010-03-18 10:44:43.000000000 -0400
-@@ -40,6 +40,7 @@
- allow cobblerd_t self:fifo_file rw_fifo_file_perms;
- allow cobblerd_t self:tcp_socket create_stream_socket_perms;
-
-+list_dirs_pattern(cobblerd_t, cobbler_etc_t, cobbler_etc_t)
- read_files_pattern(cobblerd_t, cobbler_etc_t, cobbler_etc_t)
-
- manage_dirs_pattern(cobblerd_t, cobbler_var_lib_t, cobbler_var_lib_t)
-@@ -68,6 +69,8 @@
-
- dev_read_urand(cobblerd_t)
-
-+# read /etc/nsswitch.conf
-+files_read_etc_files(cobblerd_t)
- files_read_usr_files(cobblerd_t)
- files_list_boot(cobblerd_t)
- files_list_tmp(cobblerd_t)
-@@ -119,3 +122,12 @@
- optional_policy(`
- tftp_manage_rw_content(cobblerd_t)
- ')
-+
-+########################################
-+#
-+# Cobbler web local policy.
-+#
-+
-+apache_content_template(cobbler)
-+manage_dirs_pattern(cobblerd_t, httpd_cobbler_content_rw_t, httpd_cobbler_content_rw_t)
-+manage_files_pattern(cobblerd_t, httpd_cobbler_content_rw_t, httpd_cobbler_content_rw_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.fc serefpolicy-3.7.15/policy/modules/services/consolekit.fc
---- nsaserefpolicy/policy/modules/services/consolekit.fc 2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/consolekit.fc 2010-03-18 10:44:43.000000000 -0400
-@@ -2,4 +2,5 @@
-
- /var/log/ConsoleKit(/.*)? gen_context(system_u:object_r:consolekit_log_t,s0)
- /var/run/consolekit\.pid -- gen_context(system_u:object_r:consolekit_var_run_t,s0)
--/var/run/ConsoleKit(/.*)? -- gen_context(system_u:object_r:consolekit_var_run_t,s0)
-+
-+/var/run/ConsoleKit(/.*)? gen_context(system_u:object_r:consolekit_var_run_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.if serefpolicy-3.7.15/policy/modules/services/consolekit.if
---- nsaserefpolicy/policy/modules/services/consolekit.if 2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/consolekit.if 2010-03-18 10:44:43.000000000 -0400
-@@ -57,3 +57,42 @@
- read_files_pattern($1, consolekit_log_t, consolekit_log_t)
- files_search_pids($1)
- ')
-+
-+########################################
-+##
-+## Manage consolekit log files.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`consolekit_manage_log',`
-+ gen_require(`
-+ type consolekit_log_t;
-+ ')
-+
-+ manage_files_pattern($1, consolekit_log_t, consolekit_log_t)
-+ files_search_pids($1)
-+')
-+
-+########################################
-+##
-+## Read consolekit PID files.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`consolekit_read_pid_files',`
-+ gen_require(`
-+ type consolekit_var_run_t;
-+ ')
-+
-+ files_search_pids($1)
-+ read_files_pattern($1, consolekit_var_run_t, consolekit_var_run_t)
-+')
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.te serefpolicy-3.7.15/policy/modules/services/consolekit.te
---- nsaserefpolicy/policy/modules/services/consolekit.te 2010-02-12 10:33:09.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/consolekit.te 2010-03-18 10:44:43.000000000 -0400
-@@ -16,12 +16,15 @@
- type consolekit_var_run_t;
- files_pid_file(consolekit_var_run_t)
-
-+type consolekit_tmpfs_t;
-+files_tmpfs_file(consolekit_tmpfs_t)
-+
- ########################################
- #
- # consolekit local policy
- #
-
--allow consolekit_t self:capability { setuid setgid sys_tty_config dac_override sys_nice sys_ptrace };
-+allow consolekit_t self:capability { chown setuid setgid sys_tty_config dac_override sys_nice sys_ptrace };
- allow consolekit_t self:process { getsched signal };
- allow consolekit_t self:fifo_file rw_fifo_file_perms;
- allow consolekit_t self:unix_stream_socket create_stream_socket_perms;
-@@ -59,28 +62,36 @@
- term_use_all_terms(consolekit_t)
-
- auth_use_nsswitch(consolekit_t)
-+auth_manage_pam_console_data(consolekit_t)
-+auth_write_login_records(consolekit_t)
-
- init_telinit(consolekit_t)
- init_rw_utmp(consolekit_t)
-+init_chat(consolekit_t)
-
- logging_send_syslog_msg(consolekit_t)
- logging_send_audit_msgs(consolekit_t)
-
- miscfiles_read_localization(consolekit_t)
-
-+# consolekit needs to be able to ptrace all logged in users
-+userdom_ptrace_all_users(consolekit_t)
- userdom_dontaudit_read_user_home_content_files(consolekit_t)
-+userdom_dontaudit_getattr_admin_home_files(consolekit_t)
- userdom_read_user_tmp_files(consolekit_t)
-
- hal_ptrace(consolekit_t)
-
- tunable_policy(`use_nfs_home_dirs',`
-- fs_dontaudit_list_nfs(consolekit_t)
-- fs_dontaudit_rw_nfs_files(consolekit_t)
-+ fs_read_nfs_files(consolekit_t)
- ')
-
- tunable_policy(`use_samba_home_dirs',`
-- fs_dontaudit_list_cifs(consolekit_t)
-- fs_dontaudit_rw_cifs_files(consolekit_t)
-+ fs_read_cifs_files(consolekit_t)
-+')
-+
-+optional_policy(`
-+ cron_read_system_job_lib_files(consolekit_t)
- ')
-
- optional_policy(`
-@@ -100,19 +111,33 @@
- ')
-
- optional_policy(`
-+ policykit_dbus_chat(consolekit_t)
- policykit_domtrans_auth(consolekit_t)
- policykit_read_lib(consolekit_t)
- policykit_read_reload(consolekit_t)
- ')
-
- optional_policy(`
-+ shutdown_domtrans(consolekit_t)
-+')
-+
-+optional_policy(`
- xserver_read_xdm_pid(consolekit_t)
- xserver_read_user_xauth(consolekit_t)
- xserver_non_drawing_client(consolekit_t)
- corenet_tcp_connect_xserver_port(consolekit_t)
-+ xserver_stream_connect(consolekit_t)
-+ xserver_user_x_domain_template(consolekit, consolekit_t, consolekit_tmpfs_t)
-+')
-+
-+optional_policy(`
-+ udev_domtrans(consolekit_t)
-+ udev_read_db(consolekit_t)
-+ udev_signal(consolekit_t)
- ')
-
- optional_policy(`
- #reading .Xauthity
-+ unconfined_ptrace(consolekit_t)
- unconfined_stream_connect(consolekit_t)
- ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/corosync.fc serefpolicy-3.7.15/policy/modules/services/corosync.fc
---- nsaserefpolicy/policy/modules/services/corosync.fc 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/corosync.fc 2010-03-18 10:44:43.000000000 -0400
-@@ -0,0 +1,14 @@
-+
-+/etc/rc\.d/init\.d/corosync -- gen_context(system_u:object_r:corosync_initrc_exec_t,s0)
-+
-+/usr/sbin/corosync -- gen_context(system_u:object_r:corosync_exec_t,s0)
-+
-+/usr/sbin/ccs_tool -- gen_context(system_u:object_r:corosync_exec_t,s0)
-+
-+/var/lib/corosync(/.*)? gen_context(system_u:object_r:corosync_var_lib_t,s0)
-+
-+/var/log/cluster/corosync\.log -- gen_context(system_u:object_r:corosync_var_log_t,s0)
-+
-+/var/run/cman_.* -s gen_context(system_u:object_r:corosync_var_run_t,s0)
-+/var/run/corosync\.pid -- gen_context(system_u:object_r:corosync_var_run_t,s0)
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/corosync.if serefpolicy-3.7.15/policy/modules/services/corosync.if
---- nsaserefpolicy/policy/modules/services/corosync.if 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/corosync.if 2010-03-18 10:44:43.000000000 -0400
-@@ -0,0 +1,108 @@
-+## SELinux policy for Corosync Cluster Engine
-+
-+########################################
-+##
-+## Execute a domain transition to run corosync.
-+##
-+##
-+##
-+## Domain allowed to transition.
-+##
-+##
-+#
-+interface(`corosync_domtrans',`
-+ gen_require(`
-+ type corosync_t, corosync_exec_t;
-+ ')
-+
-+ domtrans_pattern($1, corosync_exec_t, corosync_t)
-+')
-+
-+#####################################
-+##
-+## Connect to corosync over a unix domain
-+## stream socket.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`corosync_stream_connect',`
-+ gen_require(`
-+ type corosync_t, corosync_var_run_t;
-+ ')
-+
-+ files_search_pids($1)
-+ stream_connect_pattern($1, corosync_var_run_t, corosync_var_run_t, corosync_t)
-+')
-+
-+#######################################
-+##
-+## Allow the specified domain to read corosync's log files.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`corosync_read_log',`
-+ gen_require(`
-+ type corosync_var_log_t;
-+ ')
-+
-+ logging_search_logs($1)
-+ list_dirs_pattern($1, corosync_var_log_t, corosync_var_log_t)
-+ read_files_pattern($1, corosync_var_log_t, corosync_var_log_t)
-+')
-+
-+######################################
-+##
-+## All of the rules required to administrate
-+## an corosync environment
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+##
-+##
-+## The role to be allowed to manage the corosyncd domain.
-+##
-+##
-+##
-+#
-+interface(`corosyncd_admin',`
-+ gen_require(`
-+ type corosync_t, corosync_var_lib_t, corosync_var_log_t;
-+ type corosync_var_run_t, corosync_tmp_t, corosync_tmpfs_t;
-+ type corosync_initrc_exec_t;
-+ ')
-+
-+ allow $1 corosync_t:process { ptrace signal_perms };
-+ ps_process_pattern($1, corosync_t)
-+
-+ init_labeled_script_domtrans($1, corosync_initrc_exec_t)
-+ domain_system_change_exemption($1)
-+ role_transition $2 corosync_initrc_exec_t system_r;
-+ allow $2 system_r;
-+
-+ files_search_var_lib($1)
-+ admin_pattern($1, corosync_var_lib_t)
-+
-+ logging_search_logs($1)
-+ admin_pattern($1, corosync_var_log_t)
-+
-+ files_search_pids($1)
-+ admin_pattern($1, corosync_var_run_t)
-+
-+ files_search_tmp($1)
-+ admin_pattern($1, corosync_tmp_t)
-+
-+ admin_pattern($1, corosync_tmpfs_t)
-+')
-+
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/corosync.te serefpolicy-3.7.15/policy/modules/services/corosync.te
---- nsaserefpolicy/policy/modules/services/corosync.te 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/corosync.te 2010-03-18 10:44:43.000000000 -0400
-@@ -0,0 +1,115 @@
-+
-+policy_module(corosync,1.0.0)
-+
-+########################################
-+#
-+# Declarations
-+#
-+
-+type corosync_t;
-+type corosync_exec_t;
-+init_daemon_domain(corosync_t, corosync_exec_t)
-+
-+type corosync_initrc_exec_t;
-+init_script_file(corosync_initrc_exec_t);
-+
-+# tmp files
-+type corosync_tmp_t;
-+files_tmp_file(corosync_tmp_t)
-+
-+type corosync_tmpfs_t;
-+files_tmpfs_file(corosync_tmpfs_t)
-+
-+# log files
-+type corosync_var_log_t;
-+logging_log_file(corosync_var_log_t)
-+
-+# var/lib files
-+type corosync_var_lib_t;
-+files_type(corosync_var_lib_t)
-+
-+# pid files
-+type corosync_var_run_t;
-+files_pid_file(corosync_var_run_t)
-+
-+########################################
-+#
-+# corosync local policy
-+#
-+
-+allow corosync_t self:capability { sys_nice sys_resource ipc_lock };
-+allow corosync_t self:process { setrlimit setsched signal };
-+
-+allow corosync_t self:fifo_file rw_fifo_file_perms;
-+allow corosync_t self:sem create_sem_perms;
-+allow corosync_t self:unix_stream_socket { create_stream_socket_perms connectto };
-+allow corosync_t self:unix_dgram_socket create_socket_perms;
-+allow corosync_t self:udp_socket create_socket_perms;
-+
-+# tmp files
-+manage_dirs_pattern(corosync_t, corosync_tmp_t, corosync_tmp_t)
-+manage_files_pattern(corosync_t, corosync_tmp_t, corosync_tmp_t)
-+files_tmp_filetrans(corosync_t, corosync_tmp_t, { file dir })
-+
-+manage_dirs_pattern(corosync_t, corosync_tmpfs_t, corosync_tmpfs_t)
-+manage_files_pattern(corosync_t, corosync_tmpfs_t, corosync_tmpfs_t)
-+fs_tmpfs_filetrans(corosync_t, corosync_tmpfs_t,{ dir file })
-+
-+# var/lib files
-+manage_files_pattern(corosync_t, corosync_var_lib_t,corosync_var_lib_t)
-+manage_dirs_pattern(corosync_t, corosync_var_lib_t,corosync_var_lib_t)
-+manage_sock_files_pattern(corosync_t, corosync_var_lib_t,corosync_var_lib_t)
-+files_var_lib_filetrans(corosync_t,corosync_var_lib_t, { file dir sock_file })
-+
-+# log files
-+manage_files_pattern(corosync_t, corosync_var_log_t,corosync_var_log_t)
-+manage_sock_files_pattern(corosync_t, corosync_var_log_t,corosync_var_log_t)
-+logging_log_filetrans(corosync_t,corosync_var_log_t,{ sock_file file })
-+
-+# pid file
-+manage_files_pattern(corosync_t, corosync_var_run_t,corosync_var_run_t)
-+manage_sock_files_pattern(corosync_t, corosync_var_run_t,corosync_var_run_t)
-+files_pid_filetrans(corosync_t,corosync_var_run_t, { file sock_file })
-+
-+kernel_read_system_state(corosync_t)
-+
-+domain_read_all_domains_state(corosync_t)
-+
-+corenet_udp_bind_netsupport_port(corosync_t)
-+
-+corecmd_exec_bin(corosync_t)
-+
-+dev_read_urand(corosync_t)
-+
-+files_manage_mounttab(corosync_t)
-+
-+auth_use_nsswitch(corosync_t)
-+
-+miscfiles_read_localization(corosync_t)
-+
-+init_read_script_state(corosync_t)
-+init_rw_script_tmp_files(corosync_t)
-+
-+logging_send_syslog_msg(corosync_t)
-+
-+userdom_rw_user_tmpfs_files(corosync_t)
-+
-+optional_policy(`
-+ ccs_read_config(corosync_t)
-+')
-+
-+optional_policy(`
-+ # to communication with RHCS
-+ dlm_controld_manage_tmpfs_files(corosync_t)
-+ dlm_controld_rw_semaphores(corosync_t)
-+
-+ fenced_manage_tmpfs_files(corosync_t)
-+ fenced_rw_semaphores(corosync_t)
-+
-+ gfs_controld_manage_tmpfs_files(corosync_t)
-+ gfs_controld_rw_semaphores(corosync_t)
-+')
-+
-+optional_policy(`
-+ rgmanager_manage_tmpfs_files(corosync_t)
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.fc serefpolicy-3.7.15/policy/modules/services/cron.fc
---- nsaserefpolicy/policy/modules/services/cron.fc 2009-09-16 09:09:20.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/cron.fc 2010-03-18 10:44:43.000000000 -0400
-@@ -14,7 +14,7 @@
- /var/run/anacron\.pid -- gen_context(system_u:object_r:crond_var_run_t,s0)
- /var/run/atd\.pid -- gen_context(system_u:object_r:crond_var_run_t,s0)
- /var/run/crond?\.pid -- gen_context(system_u:object_r:crond_var_run_t,s0)
--/var/run/crond\.reboot -- gen_context(system_u:object_r:crond_var_run_t,s0)
-+/var/run/crond?\.reboot -- gen_context(system_u:object_r:crond_var_run_t,s0)
- /var/run/fcron\.fifo -s gen_context(system_u:object_r:crond_var_run_t,s0)
- /var/run/fcron\.pid -- gen_context(system_u:object_r:crond_var_run_t,s0)
-
-@@ -45,3 +45,7 @@
- /var/spool/fcron/systab\.orig -- gen_context(system_u:object_r:system_cron_spool_t,s0)
- /var/spool/fcron/systab -- gen_context(system_u:object_r:system_cron_spool_t,s0)
- /var/spool/fcron/new\.systab -- gen_context(system_u:object_r:system_cron_spool_t,s0)
-+
-+/var/lib/glpi/files(/.*)? gen_context(system_u:object_r:cron_var_lib_t,s0)
-+
-+/var/log/mcelog.* -- gen_context(system_u:object_r:cron_log_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-3.7.15/policy/modules/services/cron.if
---- nsaserefpolicy/policy/modules/services/cron.if 2009-09-16 09:09:20.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/cron.if 2010-03-18 10:44:43.000000000 -0400
-@@ -12,6 +12,10 @@
- ##
- #
- template(`cron_common_crontab_template',`
-+ gen_require(`
-+ type crond_t, crond_var_run_t;
-+ ')
-+
- ##############################
- #
- # Declarations
-@@ -34,6 +38,9 @@
- allow $1_t self:process { setsched signal_perms };
- allow $1_t self:fifo_file rw_fifo_file_perms;
-
-+ allow $1_t crond_t:process signal;
-+ allow $1_t crond_var_run_t:file read_file_perms;
-+
- allow $1_t $1_tmp_t:file manage_file_perms;
- files_tmp_filetrans($1_t, $1_tmp_t, file)
-
-@@ -62,6 +69,7 @@
-
- logging_send_syslog_msg($1_t)
- logging_send_audit_msgs($1_t)
-+ logging_set_loginuid($1_t)
-
- init_dontaudit_write_utmp($1_t)
- init_read_utmp($1_t)
-@@ -154,27 +162,14 @@
- #
- interface(`cron_unconfined_role',`
- gen_require(`
-- type unconfined_cronjob_t, crontab_t, crontab_tmp_t, crontab_exec_t;
-+ type unconfined_cronjob_t;
- ')
-
-- role $1 types { unconfined_cronjob_t crontab_t };
-+ role $1 types unconfined_cronjob_t;
-
- # cronjob shows up in user ps
- ps_process_pattern($2, unconfined_cronjob_t)
-
-- # Transition from the user domain to the derived domain.
-- domtrans_pattern($2, crontab_exec_t, crontab_t)
--
-- # crontab shows up in user ps
-- ps_process_pattern($2, crontab_t)
-- allow $2 crontab_t:process signal;
--
-- # Run helper programs as the user domain
-- #corecmd_bin_domtrans(crontab_t, $2)
-- #corecmd_shell_domtrans(crontab_t, $2)
-- corecmd_exec_bin(crontab_t)
-- corecmd_exec_shell(crontab_t)
--
- optional_policy(`
- gen_require(`
- class dbus send_msg;
-@@ -263,6 +258,7 @@
- domtrans_pattern(system_cronjob_t, $2, $1)
- domtrans_pattern(crond_t, $2, $1)
-
-+ userdom_dontaudit_list_admin_dir($1)
- role system_r types $1;
- ')
-
-@@ -408,7 +404,7 @@
- type crond_t;
- ')
-
-- allow $1 crond_t:fifo_file { getattr read write };
-+ allow $1 crond_t:fifo_file rw_inherited_fifo_file_perms;
- ')
-
- ########################################
-@@ -554,7 +550,7 @@
- type system_cronjob_t;
- ')
-
-- allow $1 system_cronjob_t:fifo_file rw_fifo_file_perms;
-+ allow $1 system_cronjob_t:fifo_file rw_inherited_fifo_file_perms;
- ')
-
- ########################################
-@@ -587,11 +583,14 @@
- #
- interface(`cron_read_system_job_tmp_files',`
- gen_require(`
-- type system_cronjob_tmp_t;
-+ type system_cronjob_tmp_t, cron_var_run_t;
- ')
-
- files_search_tmp($1)
- allow $1 system_cronjob_tmp_t:file read_file_perms;
-+
-+ files_search_pids($1)
-+ allow $1 cron_var_run_t:file read_file_perms;
- ')
-
- ########################################
-@@ -627,7 +626,48 @@
- interface(`cron_dontaudit_write_system_job_tmp_files',`
- gen_require(`
- type system_cronjob_tmp_t;
-+ type cron_var_run_t;
-+ type system_cronjob_var_run_t;
- ')
-
- dontaudit $1 system_cronjob_tmp_t:file write_file_perms;
-+ dontaudit $1 cron_var_run_t:file write_file_perms;
-+')
-+
-+########################################
-+##
-+## Read temporary files from the system cron jobs.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`cron_read_system_job_lib_files',`
-+ gen_require(`
-+ type system_cronjob_var_lib_t;
-+ ')
-+
-+
-+ read_files_pattern($1, system_cronjob_var_lib_t, system_cronjob_var_lib_t)
-+')
-+
-+########################################
-+##
-+## Manage files from the system cron jobs.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`cron_manage_system_job_lib_files',`
-+ gen_require(`
-+ type system_cronjob_var_lib_t;
-+ ')
-+
-+
-+ manage_files_pattern($1, system_cronjob_var_lib_t, system_cronjob_var_lib_t)
- ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-3.7.15/policy/modules/services/cron.te
---- nsaserefpolicy/policy/modules/services/cron.te 2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/cron.te 2010-03-18 10:44:43.000000000 -0400
-@@ -38,8 +38,10 @@
- type cron_var_lib_t;
- files_type(cron_var_lib_t)
-
-+# var/lib files
- type cron_var_run_t;
- files_type(cron_var_run_t)
-+mta_system_content(crond_var_run_t)
-
- # var/log files
- type cron_log_t;
-@@ -64,9 +66,12 @@
-
- type crond_tmp_t;
- files_tmp_file(crond_tmp_t)
-+files_poly_parent(crond_tmp_t)
-+mta_system_content(crond_tmp_t)
-
- type crond_var_run_t;
- files_pid_file(crond_var_run_t)
-+mta_system_content(crond_var_run_t)
-
- type crontab_exec_t;
- application_executable_file(crontab_exec_t)
-@@ -80,6 +85,7 @@
- typealias crontab_t alias { auditadm_crontab_t secadm_crontab_t };
- typealias crontab_tmp_t alias { user_crontab_tmp_t staff_crontab_tmp_t };
- typealias crontab_tmp_t alias { auditadm_crontab_tmp_t secadm_crontab_tmp_t };
-+allow admin_crontab_t crond_t:process signal;
-
- type system_cron_spool_t, cron_spool_type;
- files_type(system_cron_spool_t)
-@@ -88,6 +94,7 @@
- init_daemon_domain(system_cronjob_t, anacron_exec_t)
- corecmd_shell_entry_type(system_cronjob_t)
- role system_r types system_cronjob_t;
-+domtrans_pattern(crond_t, anacron_exec_t, system_cronjob_t)
-
- type system_cronjob_lock_t alias system_crond_lock_t;
- files_lock_file(system_cronjob_lock_t)
-@@ -109,6 +116,14 @@
- typealias user_cron_spool_t alias { auditadm_cron_spool_t secadm_cron_spool_t };
- files_type(user_cron_spool_t)
- ubac_constrained(user_cron_spool_t)
-+mta_system_content(user_cron_spool_t)
-+
-+type system_cronjob_var_lib_t;
-+files_type(system_cronjob_var_lib_t)
-+typealias system_cronjob_var_lib_t alias system_crond_var_lib_t;
-+
-+type system_cronjob_var_run_t;
-+files_pid_file(system_cronjob_var_run_t)
-
- ########################################
- #
-@@ -139,7 +154,7 @@
-
- allow crond_t self:capability { dac_override setgid setuid sys_nice dac_read_search };
- dontaudit crond_t self:capability { sys_resource sys_tty_config };
--allow crond_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
-+allow crond_t self:process ~{ ptrace setcurrent setexec setfscreate execmem execstack execheap };
- allow crond_t self:process { setexec setfscreate };
- allow crond_t self:fd use;
- allow crond_t self:fifo_file rw_fifo_file_perms;
-@@ -194,6 +209,8 @@
- corecmd_read_bin_symlinks(crond_t)
-
- domain_use_interactive_fds(crond_t)
-+domain_subj_id_change_exemption(crond_t)
-+domain_role_change_exemption(crond_t)
-
- files_read_usr_files(crond_t)
- files_read_etc_runtime_files(crond_t)
-@@ -209,7 +226,9 @@
-
- auth_use_nsswitch(crond_t)
-
-+logging_send_audit_msgs(crond_t)
- logging_send_syslog_msg(crond_t)
-+logging_set_loginuid(crond_t)
-
- seutil_read_config(crond_t)
- seutil_read_default_contexts(crond_t)
-@@ -220,8 +239,10 @@
- userdom_use_unpriv_users_fds(crond_t)
- # Not sure why this is needed
- userdom_list_user_home_dirs(crond_t)
-+userdom_create_all_users_keys(crond_t)
-
- mta_send_mail(crond_t)
-+mta_system_content(cron_spool_t)
-
- ifdef(`distro_debian',`
- # pam_limits is used
-@@ -241,8 +262,17 @@
- ')
- ')
-
--tunable_policy(`fcron_crond', `
-- allow crond_t system_cron_spool_t:file manage_file_perms;
-+tunable_policy(`allow_polyinstantiation',`
-+ files_polyinstantiate_all(crond_t)
-+')
-+
-+optional_policy(`
-+ apache_search_sys_content(crond_t)
-+')
-+
-+optional_policy(`
-+ djbdns_search_key_tinydns(crond_t)
-+ djbdns_link_key_tinydns(crond_t)
- ')
-
- optional_policy(`
-@@ -251,6 +281,20 @@
- ')
-
- optional_policy(`
-+ # these should probably be unconfined_crond_t
-+ dbus_system_bus_client(crond_t)
-+ init_dbus_send_script(crond_t)
-+')
-+
-+optional_policy(`
-+ mono_domtrans(crond_t)
-+')
-+
-+tunable_policy(`fcron_crond', `
-+ allow crond_t system_cron_spool_t:file manage_file_perms;
-+')
-+
-+optional_policy(`
- amanda_search_var_lib(crond_t)
- ')
-
-@@ -260,6 +304,8 @@
-
- optional_policy(`
- hal_dbus_chat(crond_t)
-+ hal_write_log(crond_t)
-+ hal_dbus_chat(system_cronjob_t)
- ')
-
- optional_policy(`
-@@ -302,10 +348,17 @@
-
- # This is to handle /var/lib/misc directory. Used currently
- # by prelink var/lib files for cron
--allow system_cronjob_t cron_var_lib_t:file manage_file_perms;
-+allow system_cronjob_t cron_var_lib_t:file { manage_file_perms relabelfrom relabelto };
- files_var_lib_filetrans(system_cronjob_t, cron_var_lib_t, file)
-
-+allow system_cronjob_t cron_var_run_t:file manage_file_perms;
-+files_pid_filetrans(system_cronjob_t, cron_var_run_t, file)
-+
- allow system_cronjob_t system_cron_spool_t:file read_file_perms;
-+
-+# anacron forces the following
-+manage_files_pattern(system_cronjob_t, system_cron_spool_t, system_cron_spool_t)
-+
- # The entrypoint interface is not used as this is not
- # a regular entrypoint. Since crontab files are
- # not directly executed, crond must ensure that
-@@ -325,6 +378,7 @@
- allow system_cronjob_t crond_t:fd use;
- allow system_cronjob_t crond_t:fifo_file rw_file_perms;
- allow system_cronjob_t crond_t:process sigchld;
-+allow crond_t system_cronjob_t:key manage_key_perms;
-
- # Write /var/lock/makewhatis.lock.
- allow system_cronjob_t system_cronjob_lock_t:file manage_file_perms;
-@@ -336,9 +390,13 @@
- filetrans_pattern(system_cronjob_t, crond_tmp_t, system_cronjob_tmp_t, { file lnk_file })
- files_tmp_filetrans(system_cronjob_t, system_cronjob_tmp_t, file)
-
-+# var/lib files for system_crond
-+files_search_var_lib(system_cronjob_t)
-+manage_files_pattern(system_cronjob_t, system_cronjob_var_lib_t, system_cronjob_var_lib_t)
-+
- # Read from /var/spool/cron.
- allow system_cronjob_t cron_spool_t:dir list_dir_perms;
--allow system_cronjob_t cron_spool_t:file read_file_perms;
-+allow system_cronjob_t cron_spool_t:file rw_file_perms;
-
- kernel_read_kernel_sysctls(system_cronjob_t)
- kernel_read_system_state(system_cronjob_t)
-@@ -361,6 +419,7 @@
- dev_getattr_all_blk_files(system_cronjob_t)
- dev_getattr_all_chr_files(system_cronjob_t)
- dev_read_urand(system_cronjob_t)
-+dev_read_sysfs(system_cronjob_t)
-
- fs_getattr_all_fs(system_cronjob_t)
- fs_getattr_all_files(system_cronjob_t)
-@@ -387,6 +446,7 @@
- # Access other spool directories like
- # /var/spool/anacron and /var/spool/slrnpull.
- files_manage_generic_spool(system_cronjob_t)
-+files_create_boot_flag(system_cronjob_t)
-
- init_use_script_fds(system_cronjob_t)
- init_read_utmp(system_cronjob_t)
-@@ -411,6 +471,8 @@
-
- ifdef(`distro_redhat', `
- # Run the rpm program in the rpm_t domain. Allow creation of RPM log files
-+ allow crond_t system_cron_spool_t:file manage_file_perms;
-+
- # via redirection of standard out.
- optional_policy(`
- rpm_manage_log(system_cronjob_t)
-@@ -435,6 +497,7 @@
- apache_read_config(system_cronjob_t)
- apache_read_log(system_cronjob_t)
- apache_read_sys_content(system_cronjob_t)
-+ apache_delete_cache(system_cronjob_t)
- ')
-
- optional_policy(`
-@@ -442,6 +505,14 @@
- ')
-
- optional_policy(`
-+ dbus_system_bus_client(system_cronjob_t)
-+')
-+
-+optional_policy(`
-+ exim_read_spool_files(system_cronjob_t)
-+')
-+
-+optional_policy(`
- ftp_read_log(system_cronjob_t)
- ')
-
-@@ -456,11 +527,16 @@
- ')
-
- optional_policy(`
-+ mono_domtrans(system_cronjob_t)
-+')
-+
-+optional_policy(`
- mrtg_append_create_logs(system_cronjob_t)
- ')
-
- optional_policy(`
- mta_send_mail(system_cronjob_t)
-+ mta_system_content(system_cron_spool_t)
- ')
-
- optional_policy(`
-@@ -476,7 +552,7 @@
- prelink_manage_lib(system_cronjob_t)
- prelink_manage_log(system_cronjob_t)
- prelink_read_cache(system_cronjob_t)
-- prelink_relabelfrom_lib(system_cronjob_t)
-+ prelink_relabel_lib(system_cronjob_t)
- ')
-
- optional_policy(`
-@@ -491,6 +567,7 @@
-
- optional_policy(`
- spamassassin_manage_lib_files(system_cronjob_t)
-+ spamassassin_manage_home_client(system_cronjob_t)
- ')
-
- optional_policy(`
-@@ -498,6 +575,9 @@
- ')
-
- optional_policy(`
-+ unconfined_dbus_send(crond_t)
-+ unconfined_shell_domtrans(crond_t)
-+ unconfined_domain(crond_t)
- unconfined_domain(system_cronjob_t)
- userdom_user_home_dir_filetrans_user_home_content(system_cronjob_t, { dir file lnk_file fifo_file sock_file })
- ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-3.7.15/policy/modules/services/cups.fc
---- nsaserefpolicy/policy/modules/services/cups.fc 2009-07-28 15:51:13.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/cups.fc 2010-03-18 10:44:43.000000000 -0400
-@@ -13,10 +13,14 @@
- /etc/cups/certs/.* -- gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
- /etc/rc\.d/init\.d/cups -- gen_context(system_u:object_r:cupsd_initrc_exec_t,s0)
-
-+/etc/cups/interfaces(/.*)? gen_context(system_u:object_r:cupsd_interface_t,s0)
-+
- /etc/hp(/.*)? gen_context(system_u:object_r:hplip_etc_t,s0)
-
- /etc/printcap.* -- gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
-
-+/lib/udev/udev-configure-printer -- gen_context(system_u:object_r:cupsd_config_exec_t,s0)
-+
- /opt/gutenprint/ppds(/.*)? gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
-
- /usr/bin/cups-config-daemon -- gen_context(system_u:object_r:cupsd_config_exec_t,s0)
-@@ -30,6 +34,7 @@
- /usr/lib/cups/backend/hp.* -- gen_context(system_u:object_r:hplip_exec_t,s0)
- /usr/lib64/cups/backend/hp.* -- gen_context(system_u:object_r:hplip_exec_t,s0)
-
-+/usr/libexec/cups-pk-helper-mechanism -- gen_context(system_u:object_r:cupsd_config_exec_t,s0)
- /usr/libexec/hal_lpadmin -- gen_context(system_u:object_r:cupsd_config_exec_t,s0)
-
- /usr/sbin/hp-[^/]+ -- gen_context(system_u:object_r:hplip_exec_t,s0)
-@@ -52,13 +57,22 @@
- /var/lib/cups/certs -d gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
- /var/lib/cups/certs/.* -- gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
-
-+/var/lib/hp(/.*)? gen_context(system_u:object_r:hplip_var_lib_t,s0)
-+
- /var/log/cups(/.*)? gen_context(system_u:object_r:cupsd_log_t,s0)
- /var/log/turboprint.* gen_context(system_u:object_r:cupsd_log_t,s0)
-
- /var/ccpd(/.*)? gen_context(system_u:object_r:cupsd_var_run_t,s0)
-+/var/ekpd(/.*)? gen_context(system_u:object_r:cupsd_var_run_t,s0)
- /var/run/cups(/.*)? gen_context(system_u:object_r:cupsd_var_run_t,s0)
- /var/run/hp.*\.pid -- gen_context(system_u:object_r:hplip_var_run_t,s0)
- /var/run/hp.*\.port -- gen_context(system_u:object_r:hplip_var_run_t,s0)
- /var/run/ptal-printd(/.*)? gen_context(system_u:object_r:ptal_var_run_t,s0)
- /var/run/ptal-mlcd(/.*)? gen_context(system_u:object_r:ptal_var_run_t,s0)
-+/var/run/udev-configure-printer(/.*)? gen_context(system_u:object_r:cupsd_config_var_run_t,s0)
- /var/turboprint(/.*)? gen_context(system_u:object_r:cupsd_var_run_t,s0)
-+
-+/usr/local/Brother/(.*/)?inf(/.*)? gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
-+/usr/local/Printer/(.*/)?inf(/.*)? gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
-+
-+/usr/local/linuxprinter/ppd(/.*)? gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-3.7.15/policy/modules/services/cups.te
---- nsaserefpolicy/policy/modules/services/cups.te 2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/cups.te 2010-03-18 10:44:43.000000000 -0400
-@@ -23,6 +23,9 @@
- type cupsd_initrc_exec_t;
- init_script_file(cupsd_initrc_exec_t)
-
-+type cupsd_interface_t;
-+files_type(cupsd_interface_t)
-+
- type cupsd_rw_etc_t;
- files_config_file(cupsd_rw_etc_t)
-
-@@ -64,11 +67,14 @@
- # For CUPS to run as a backend
- cups_backend(hplip_t, hplip_exec_t)
-
-+type hplip_tmp_t;
-+files_tmp_file(hplip_tmp_t)
-+
- type hplip_etc_t;
- files_config_file(hplip_etc_t)
-
--type hplip_tmp_t;
--files_tmp_file(hplip_tmp_t)
-+type hplip_var_lib_t;
-+files_type(hplip_var_lib_t)
-
- type hplip_var_run_t;
- files_pid_file(hplip_var_run_t)
-@@ -97,7 +103,7 @@
- #
-
- # /usr/lib/cups/backend/serial needs sys_admin(?!)
--allow cupsd_t self:capability { sys_admin dac_override dac_read_search kill setgid setuid fsetid net_bind_service fowner chown dac_override sys_rawio sys_resource sys_tty_config };
-+allow cupsd_t self:capability { ipc_lock sys_admin dac_override dac_read_search kill setgid setuid fsetid net_bind_service fowner chown dac_override sys_rawio sys_resource sys_tty_config };
- dontaudit cupsd_t self:capability { sys_tty_config net_admin };
- allow cupsd_t self:process { getpgid setpgid setsched signal_perms };
- allow cupsd_t self:fifo_file rw_fifo_file_perms;
-@@ -105,6 +111,7 @@
- allow cupsd_t self:unix_dgram_socket create_socket_perms;
- allow cupsd_t self:netlink_selinux_socket create_socket_perms;
- allow cupsd_t self:shm create_shm_perms;
-+allow cupsd_t self:sem create_sem_perms;
- allow cupsd_t self:tcp_socket create_stream_socket_perms;
- allow cupsd_t self:udp_socket create_socket_perms;
- allow cupsd_t self:appletalk_socket create_socket_perms;
-@@ -116,6 +123,9 @@
- read_lnk_files_pattern(cupsd_t, cupsd_etc_t, cupsd_etc_t)
- files_search_etc(cupsd_t)
-
-+manage_files_pattern(cupsd_t, cupsd_interface_t, cupsd_interface_t)
-+can_exec(cupsd_t, cupsd_interface_t)
-+
- manage_dirs_pattern(cupsd_t, cupsd_etc_t, cupsd_rw_etc_t)
- manage_files_pattern(cupsd_t, cupsd_etc_t, cupsd_rw_etc_t)
- filetrans_pattern(cupsd_t, cupsd_etc_t, cupsd_rw_etc_t, file)
-@@ -156,6 +166,7 @@
- kernel_read_system_state(cupsd_t)
- kernel_read_network_state(cupsd_t)
- kernel_read_all_sysctls(cupsd_t)
-+kernel_request_load_module(cupsd_t)
-
- corenet_all_recvfrom_unlabeled(cupsd_t)
- corenet_all_recvfrom_netlabel(cupsd_t)
-@@ -171,6 +182,7 @@
- corenet_udp_bind_generic_node(cupsd_t)
- corenet_tcp_bind_ipp_port(cupsd_t)
- corenet_udp_bind_ipp_port(cupsd_t)
-+corenet_udp_bind_howl_port(cupsd_t)
- corenet_tcp_bind_reserved_port(cupsd_t)
- corenet_dontaudit_tcp_bind_all_reserved_ports(cupsd_t)
- corenet_tcp_bind_all_rpc_ports(cupsd_t)
-@@ -191,6 +203,7 @@
-
- fs_getattr_all_fs(cupsd_t)
- fs_search_auto_mountpoints(cupsd_t)
-+fs_search_fusefs(cupsd_t)
- fs_read_anon_inodefs_files(cupsd_t)
-
- mls_file_downgrade(cupsd_t)
-@@ -250,6 +263,7 @@
- miscfiles_read_localization(cupsd_t)
- # invoking ghostscript needs to read fonts
- miscfiles_read_fonts(cupsd_t)
-+miscfiles_setattr_fonts_cache_dirs(cupsd_t)
-
- seutil_read_config(cupsd_t)
- sysnet_exec_ifconfig(cupsd_t)
-@@ -285,8 +299,10 @@
- hal_dbus_chat(cupsd_t)
- ')
-
-+ # talk to processes that do not have policy
- optional_policy(`
- unconfined_dbus_chat(cupsd_t)
-+ files_write_generic_pid_pipes(cupsd_t)
- ')
- ')
-
-@@ -317,6 +333,10 @@
- ')
-
- optional_policy(`
-+ snmp_read_snmp_var_lib_files(cupsd_t)
-+')
-+
-+optional_policy(`
- udev_read_db(cupsd_t)
- ')
-
-@@ -327,7 +347,7 @@
-
- allow cupsd_config_t self:capability { chown dac_override sys_tty_config };
- dontaudit cupsd_config_t self:capability sys_tty_config;
--allow cupsd_config_t self:process signal_perms;
-+allow cupsd_config_t self:process { getsched signal_perms };
- allow cupsd_config_t self:fifo_file rw_fifo_file_perms;
- allow cupsd_config_t self:unix_stream_socket create_socket_perms;
- allow cupsd_config_t self:unix_dgram_socket create_socket_perms;
-@@ -378,6 +398,8 @@
- dev_read_rand(cupsd_config_t)
- dev_rw_generic_usb_dev(cupsd_config_t)
-
-+files_search_all_mountpoints(cupsd_config_t)
-+
- fs_getattr_all_fs(cupsd_config_t)
- fs_search_auto_mountpoints(cupsd_config_t)
-
-@@ -407,6 +429,7 @@
-
- userdom_dontaudit_use_unpriv_user_fds(cupsd_config_t)
- userdom_dontaudit_search_user_home_dirs(cupsd_config_t)
-+userdom_rw_user_tmp_files(cupsd_config_t)
-
- cups_stream_connect(cupsd_config_t)
-
-@@ -419,12 +442,15 @@
- ')
-
- optional_policy(`
-+ term_use_generic_ptys(cupsd_config_t)
-+')
-+
-+optional_policy(`
- cron_system_entry(cupsd_config_t, cupsd_config_exec_t)
- ')
-
- optional_policy(`
-- dbus_system_bus_client(cupsd_config_t)
-- dbus_connect_system_bus(cupsd_config_t)
-+ dbus_system_domain(cupsd_config_t, cupsd_config_exec_t)
-
- optional_policy(`
- hal_dbus_chat(cupsd_config_t)
-@@ -432,6 +458,10 @@
- ')
-
- optional_policy(`
-+ gnome_dontaudit_search_config(cupsd_config_t)
-+')
-+
-+optional_policy(`
- hal_domtrans(cupsd_config_t)
- hal_read_tmp_files(cupsd_config_t)
- hal_dontaudit_use_fds(hplip_t)
-@@ -446,6 +476,11 @@
- ')
-
- optional_policy(`
-+ policykit_dbus_chat(cupsd_config_t)
-+ userdom_read_all_users_state(cupsd_config_t)
-+')
-+
-+optional_policy(`
- rpm_read_db(cupsd_config_t)
- ')
-
-@@ -457,6 +492,10 @@
- udev_read_db(cupsd_config_t)
- ')
-
-+optional_policy(`
-+ unconfined_stream_connect(cupsd_config_t)
-+')
-+
- ########################################
- #
- # Cups lpd support
-@@ -520,6 +559,7 @@
- logging_send_syslog_msg(cupsd_lpd_t)
-
- miscfiles_read_localization(cupsd_lpd_t)
-+miscfiles_setattr_fonts_cache_dirs(cupsd_lpd_t)
-
- cups_stream_connect(cupsd_lpd_t)
-
-@@ -532,7 +572,7 @@
- # cups_pdf local policy
- #
-
--allow cups_pdf_t self:capability { chown fsetid setuid setgid dac_override };
-+allow cups_pdf_t self:capability { chown fowner fsetid setuid setgid dac_override };
- allow cups_pdf_t self:fifo_file rw_file_perms;
- allow cups_pdf_t self:unix_stream_socket create_stream_socket_perms;
-
-@@ -542,6 +582,8 @@
- manage_dirs_pattern(cups_pdf_t, cups_pdf_tmp_t, cups_pdf_tmp_t)
- files_tmp_filetrans(cups_pdf_t, cups_pdf_tmp_t, { file dir })
-
-+fs_rw_anon_inodefs_files(cups_pdf_t)
-+
- kernel_read_system_state(cups_pdf_t)
-
- files_read_etc_files(cups_pdf_t)
-@@ -556,13 +598,18 @@
- miscfiles_read_fonts(cups_pdf_t)
-
- userdom_home_filetrans_user_home_dir(cups_pdf_t)
-+userdom_user_home_dir_filetrans_pattern(cups_pdf_t, { file dir })
- userdom_manage_user_home_content_dirs(cups_pdf_t)
- userdom_manage_user_home_content_files(cups_pdf_t)
-
- lpd_manage_spool(cups_pdf_t)
-
-+optional_policy(`
-+ gnome_read_config(cups_pdf_t)
-+')
-
- tunable_policy(`use_nfs_home_dirs',`
-+ fs_search_auto_mountpoints(cups_pdf_t)
- fs_manage_nfs_dirs(cups_pdf_t)
- fs_manage_nfs_files(cups_pdf_t)
- ')
-@@ -601,6 +648,9 @@
- read_lnk_files_pattern(hplip_t, hplip_etc_t, hplip_etc_t)
- files_search_etc(hplip_t)
-
-+manage_files_pattern(hplip_t, hplip_var_lib_t, hplip_var_lib_t)
-+manage_lnk_files_pattern(hplip_t, hplip_var_lib_t, hplip_var_lib_t)
-+
- manage_fifo_files_pattern(hplip_t, hplip_tmp_t, hplip_tmp_t)
- files_tmp_filetrans(hplip_t, hplip_tmp_t, fifo_file )
-
-@@ -627,6 +677,7 @@
- corenet_tcp_connect_ipp_port(hplip_t)
- corenet_sendrecv_hplip_client_packets(hplip_t)
- corenet_receive_hplip_server_packets(hplip_t)
-+corenet_udp_bind_howl_port(hplip_t)
-
- dev_read_sysfs(hplip_t)
- dev_rw_printer(hplip_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-3.7.15/policy/modules/services/cvs.te
---- nsaserefpolicy/policy/modules/services/cvs.te 2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/cvs.te 2010-03-18 10:44:43.000000000 -0400
-@@ -93,6 +93,7 @@
- auth_can_read_shadow_passwords(cvs_t)
- tunable_policy(`allow_cvs_read_shadow',`
- auth_tunable_read_shadow(cvs_t)
-+ allow cvs_t self:capability dac_override;
- ')
-
- optional_policy(`
-@@ -112,4 +113,5 @@
- read_files_pattern(httpd_cvs_script_t, cvs_data_t, cvs_data_t)
- manage_dirs_pattern(httpd_cvs_script_t, cvs_tmp_t, cvs_tmp_t)
- manage_files_pattern(httpd_cvs_script_t, cvs_tmp_t, cvs_tmp_t)
-+ files_tmp_filetrans(httpd_cvs_script_t, cvs_tmp_t, { file dir })
- ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.te serefpolicy-3.7.15/policy/modules/services/cyrus.te
---- nsaserefpolicy/policy/modules/services/cyrus.te 2010-01-07 14:53:53.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/cyrus.te 2010-03-18 10:44:43.000000000 -0400
-@@ -75,6 +75,7 @@
- corenet_tcp_bind_mail_port(cyrus_t)
- corenet_tcp_bind_lmtp_port(cyrus_t)
- corenet_tcp_bind_pop_port(cyrus_t)
-+corenet_tcp_bind_sieve_port(cyrus_t)
- corenet_tcp_connect_all_ports(cyrus_t)
- corenet_sendrecv_mail_server_packets(cyrus_t)
- corenet_sendrecv_pop_server_packets(cyrus_t)
-@@ -135,6 +136,7 @@
- ')
-
- optional_policy(`
-+ files_dontaudit_write_usr_dirs(cyrus_t)
- snmp_read_snmp_var_lib_files(cyrus_t)
- snmp_dontaudit_write_snmp_var_lib_files(cyrus_t)
- snmp_stream_connect(cyrus_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.7.15/policy/modules/services/dbus.if
---- nsaserefpolicy/policy/modules/services/dbus.if 2009-07-28 13:28:33.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/dbus.if 2010-03-18 10:44:43.000000000 -0400
-@@ -42,8 +42,10 @@
- gen_require(`
- class dbus { send_msg acquire_svc };
-
-+ attribute dbusd_unconfined;
- attribute session_bus_type;
- type system_dbusd_t, session_dbusd_tmp_t, dbusd_exec_t, dbusd_etc_t;
-+ type $1_t;
- ')
-
- ##############################
-@@ -76,7 +78,7 @@
- allow $3 $1_dbusd_t:unix_stream_socket connectto;
-
- # SE-DBus specific permissions
-- allow $3 $1_dbusd_t:dbus { send_msg acquire_svc };
-+ allow { dbusd_unconfined $3 } $1_dbusd_t:dbus { send_msg acquire_svc };
- allow $3 system_dbusd_t:dbus { send_msg acquire_svc };
-
- allow $1_dbusd_t dbusd_etc_t:dir list_dir_perms;
-@@ -88,10 +90,10 @@
- files_tmp_filetrans($1_dbusd_t, session_dbusd_tmp_t, { file dir })
-
- domtrans_pattern($3, dbusd_exec_t, $1_dbusd_t)
-- allow $3 $1_dbusd_t:process { sigkill signal };
-+ allow $3 $1_dbusd_t:process { signull sigkill signal };
-
- # cjp: this seems very broken
-- corecmd_bin_domtrans($1_dbusd_t, $3)
-+ corecmd_bin_domtrans($1_dbusd_t, $1_t)
- allow $1_dbusd_t $3:process sigkill;
- allow $3 $1_dbusd_t:fd use;
- allow $3 $1_dbusd_t:fifo_file rw_fifo_file_perms;
-@@ -127,6 +129,7 @@
- fs_getattr_romfs($1_dbusd_t)
- fs_getattr_xattr_fs($1_dbusd_t)
- fs_list_inotifyfs($1_dbusd_t)
-+ fs_dontaudit_list_nfs($1_dbusd_t)
-
- selinux_get_fs_mount($1_dbusd_t)
- selinux_validate_context($1_dbusd_t)
-@@ -146,6 +149,9 @@
- seutil_read_config($1_dbusd_t)
- seutil_read_default_contexts($1_dbusd_t)
-
-+ term_use_all_terms($1_dbusd_t)
-+
-+ userdom_dontaudit_search_admin_dir($1_dbusd_t)
- userdom_read_user_home_content_files($1_dbusd_t)
-
- ifdef(`hide_broken_symptoms', `
-@@ -153,13 +159,13 @@
- ')
-
- optional_policy(`
-- hal_dbus_chat($1_dbusd_t)
-+ gnome_read_gconf_home_files($1_dbusd_t)
- ')
-
- optional_policy(`
-- xserver_use_xdm_fds($1_dbusd_t)
-- xserver_rw_xdm_pipes($1_dbusd_t)
-+ hal_dbus_chat($1_dbusd_t)
- ')
-+
- ')
-
- #######################################
-@@ -178,10 +184,12 @@
- type system_dbusd_t, system_dbusd_t;
- type system_dbusd_var_run_t, system_dbusd_var_lib_t;
- class dbus send_msg;
-+ attribute dbusd_unconfined;
- ')
-
- # SE-DBus specific permissions
- allow $1 { system_dbusd_t self }:dbus send_msg;
-+ allow { system_dbusd_t dbusd_unconfined } $1:dbus send_msg;
-
- read_files_pattern($1, system_dbusd_var_lib_t, system_dbusd_var_lib_t)
- files_search_var_lib($1)
-@@ -256,7 +264,7 @@
-
- ########################################
- ##
--## Connect to the the session DBUS
-+## Connect to the system DBUS
- ## for service (acquire_svc).
- ##
- ##
-@@ -364,6 +372,19 @@
- dbus_system_bus_client($1)
- dbus_connect_system_bus($1)
-
-+ ps_process_pattern(system_dbusd_t, $1)
-+
-+ userdom_dontaudit_search_admin_dir($1)
-+ userdom_read_all_users_state($1)
-+
-+ optional_policy(`
-+ rpm_script_dbus_chat($1)
-+ ')
-+
-+ optional_policy(`
-+ unconfined_dbus_send($1)
-+ ')
-+
- ifdef(`hide_broken_symptoms', `
- dontaudit $1 system_dbusd_t:netlink_selinux_socket { read write };
- ')
-@@ -405,3 +426,24 @@
-
- typeattribute $1 dbusd_unconfined;
- ')
-+
-+########################################
-+##
-+## Create, read, write, and delete
-+## system dbus lib files.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`dbus_manage_lib_files',`
-+ gen_require(`
-+ type system_dbusd_var_lib_t;
-+ ')
-+
-+ files_search_var_lib($1)
-+ manage_files_pattern($1, system_dbusd_var_lib_t, system_dbusd_var_lib_t)
-+')
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-3.7.15/policy/modules/services/dbus.te
---- nsaserefpolicy/policy/modules/services/dbus.te 2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/dbus.te 2010-03-18 10:44:43.000000000 -0400
-@@ -86,6 +86,7 @@
- dev_read_sysfs(system_dbusd_t)
-
- fs_getattr_all_fs(system_dbusd_t)
-+fs_list_inotifyfs(system_dbusd_t)
- fs_search_auto_mountpoints(system_dbusd_t)
- fs_dontaudit_list_nfs(system_dbusd_t)
-
-@@ -121,6 +122,8 @@
-
- init_use_fds(system_dbusd_t)
- init_use_script_ptys(system_dbusd_t)
-+init_bin_domtrans_spec(system_dbusd_t)
-+init_domtrans_script(system_dbusd_t)
-
- logging_send_audit_msgs(system_dbusd_t)
- logging_send_syslog_msg(system_dbusd_t)
-@@ -140,6 +143,15 @@
- ')
-
- optional_policy(`
-+ gnome_exec_gconf(system_dbusd_t)
-+')
-+
-+optional_policy(`
-+ networkmanager_initrc_domtrans(system_dbusd_t)
-+')
-+
-+optional_policy(`
-+ policykit_dbus_chat(system_dbusd_t)
- policykit_domtrans_auth(system_dbusd_t)
- policykit_search_lib(system_dbusd_t)
- ')
-@@ -156,5 +168,24 @@
- #
- # Unconfined access to this module
- #
-+optional_policy(`
-+ gen_require(`
-+ type unconfined_dbusd_t;
-+ ')
-+ unconfined_domain(unconfined_dbusd_t)
-+ unconfined_execmem_domtrans(unconfined_dbusd_t)
-+
-+ optional_policy(`
-+ xserver_rw_shm(unconfined_dbusd_t)
-+ ')
-+')
-
- allow dbusd_unconfined session_bus_type:dbus all_dbus_perms;
-+allow dbusd_unconfined dbusd_unconfined:dbus all_dbus_perms;
-+allow session_bus_type dbusd_unconfined:dbus send_msg;
-+
-+optional_policy(`
-+ xserver_use_xdm_fds(session_bus_type)
-+ xserver_rw_xdm_pipes(session_bus_type)
-+ xserver_append_xdm_home_files(session_bus_type)
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dcc.te serefpolicy-3.7.15/policy/modules/services/dcc.te
---- nsaserefpolicy/policy/modules/services/dcc.te 2010-01-07 14:53:53.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/dcc.te 2010-03-18 10:44:43.000000000 -0400
-@@ -81,7 +81,7 @@
- # dcc daemon controller local policy
- #
-
--allow cdcc_t self:capability setuid;
-+allow cdcc_t self:capability { setuid setgid };
- allow cdcc_t self:unix_dgram_socket create_socket_perms;
- allow cdcc_t self:udp_socket create_socket_perms;
-
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/denyhosts.fc serefpolicy-3.7.15/policy/modules/services/denyhosts.fc
---- nsaserefpolicy/policy/modules/services/denyhosts.fc 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/denyhosts.fc 2010-03-18 10:44:43.000000000 -0400
-@@ -0,0 +1,7 @@
-+/etc/rc\.d/init\.d/denyhosts -- gen_context(system_u:object_r:denyhosts_initrc_exec_t, s0)
-+
-+/usr/bin/denyhosts\.py -- gen_context(system_u:object_r:denyhosts_exec_t, s0)
-+
-+/var/lib/denyhosts(/.*)? gen_context(system_u:object_r:denyhosts_var_lib_t, s0)
-+/var/lock/subsys/denyhosts -- gen_context(system_u:object_r:denyhosts_var_lock_t, s0)
-+/var/log/denyhosts(/.*)? gen_context(system_u:object_r:denyhosts_var_log_t, s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/denyhosts.if serefpolicy-3.7.15/policy/modules/services/denyhosts.if
---- nsaserefpolicy/policy/modules/services/denyhosts.if 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/denyhosts.if 2010-03-18 10:44:43.000000000 -0400
-@@ -0,0 +1,90 @@
-+## Deny Hosts.
-+##
-+##
-+## DenyHosts is a script intended to be run by Linux
-+## system administrators to help thwart SSH server attacks
-+## (also known as dictionary based attacks and brute force
-+## attacks).
-+##
-+##
-+
-+########################################
-+##
-+## Execute a domain transition to run denyhosts.
-+##
-+##
-+##
-+## Domain allowed to transition.
-+##
-+##
-+#
-+interface(`denyhosts_domtrans', `
-+ gen_require(`
-+ type denyhosts_t, denyhosts_exec_t;
-+ ')
-+
-+ domtrans_pattern($1, denyhosts_exec_t, denyhosts_t)
-+')
-+
-+########################################
-+##
-+## Execute denyhost server in the denyhost domain.
-+##
-+##
-+##
-+## The type of the process performing this action.
-+##
-+##
-+#
-+interface(`denyhosts_initrc_domtrans', `
-+ gen_require(`
-+ type denyhosts_initrc_exec_t;
-+ ')
-+
-+ init_labeled_script_domtrans($1, denyhosts_initrc_exec_t)
-+')
-+
-+########################################
-+##
-+## All of the rules required to administrate
-+## an denyhosts environment.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+##
-+##
-+## Role allowed access.
-+##
-+##
-+##
-+#
-+interface(`denyhosts_admin', `
-+ gen_require(`
-+ type denyhosts_t, denyhosts_var_lib_t, denyhosts_var_lock_t;
-+ type denyhosts_var_log_t;
-+ ')
-+
-+ allow $1 denyhosts_t:process { ptrace signal_perms getattr };
-+ read_files_pattern($1, denyhosts_t, denyhosts_t)
-+
-+ admin_pattern($1, denyhosts_var_lib_t)
-+
-+ logging_search_logs($1)
-+ admin_pattern($1, denyhosts_var_log_t)
-+
-+ files_search_locks($1)
-+ admin_pattern($1, denyhosts_var_lock_t)
-+
-+ denyhosts_initrc_domtrans($1)
-+ domain_system_change_exemption($1)
-+ role_transition $2 denyhosts_initrc_exec_t system_r;
-+ allow $2 system_r;
-+
-+ kernel_search_proc($1)
-+ allow $1 denyhosts_t:dir list_dir_perms;
-+ ps_process_pattern($1, denyhosts_t)
-+ read_lnk_files_pattern($1, denyhosts_t, denyhosts_t)
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/denyhosts.te serefpolicy-3.7.15/policy/modules/services/denyhosts.te
---- nsaserefpolicy/policy/modules/services/denyhosts.te 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/denyhosts.te 2010-03-18 10:44:43.000000000 -0400
-@@ -0,0 +1,72 @@
-+
-+policy_module(denyhosts, 1.0.0)
-+
-+########################################
-+#
-+# DenyHosts personal declarations.
-+#
-+
-+type denyhosts_t;
-+type denyhosts_exec_t;
-+init_daemon_domain(denyhosts_t, denyhosts_exec_t)
-+
-+type denyhosts_initrc_exec_t;
-+init_script_file(denyhosts_initrc_exec_t)
-+
-+type denyhosts_var_lib_t;
-+files_type(denyhosts_var_lib_t)
-+
-+type denyhosts_var_lock_t;
-+files_lock_file(denyhosts_var_lock_t)
-+
-+type denyhosts_var_log_t;
-+logging_log_file(denyhosts_var_log_t)
-+
-+########################################
-+#
-+# DenyHosts personal policy.
-+#
-+
-+allow denyhosts_t self:netlink_route_socket create_netlink_socket_perms;
-+allow denyhosts_t self:tcp_socket create_socket_perms;
-+allow denyhosts_t self:udp_socket create_socket_perms;
-+
-+manage_files_pattern(denyhosts_t, denyhosts_var_lib_t, denyhosts_var_lib_t)
-+files_var_lib_filetrans(denyhosts_t, denyhosts_var_lib_t, file)
-+
-+manage_dirs_pattern(denyhosts_t, denyhosts_var_lock_t, denyhosts_var_lock_t)
-+manage_files_pattern(denyhosts_t, denyhosts_var_lock_t, denyhosts_var_lock_t)
-+files_lock_filetrans(denyhosts_t, denyhosts_var_lock_t, { dir file })
-+
-+append_files_pattern(denyhosts_t, denyhosts_var_log_t, denyhosts_var_log_t)
-+create_files_pattern(denyhosts_t, denyhosts_var_log_t, denyhosts_var_log_t)
-+read_files_pattern(denyhosts_t, denyhosts_var_log_t, denyhosts_var_log_t)
-+setattr_files_pattern(denyhosts_t, denyhosts_var_log_t, denyhosts_var_log_t)
-+logging_log_filetrans(denyhosts_t, denyhosts_var_log_t, file)
-+
-+corecmd_list_bin(denyhosts_t)
-+corecmd_read_bin_symlinks(denyhosts_t)
-+
-+corenet_all_recvfrom_unlabeled(denyhosts_t)
-+corenet_all_recvfrom_netlabel(denyhosts_t)
-+corenet_tcp_sendrecv_generic_if(denyhosts_t)
-+corenet_tcp_sendrecv_generic_node(denyhosts_t)
-+corenet_tcp_bind_generic_node(denyhosts_t)
-+corenet_sendrecv_smtp_client_packets(denyhosts_t)
-+corenet_tcp_connect_smtp_port(denyhosts_t)
-+
-+dev_read_urand(denyhosts_t)
-+
-+kernel_read_system_state(denyhosts_t)
-+
-+# /var/log/secure
-+logging_read_generic_logs(denyhosts_t)
-+
-+miscfiles_read_localization(denyhosts_t)
-+
-+sysnet_manage_config(denyhosts_t)
-+sysnet_etc_filetrans_config(denyhosts_t)
-+
-+optional_policy(`
-+ cron_system_entry(denyhosts_t, denyhosts_exec_t)
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/devicekit.fc serefpolicy-3.7.15/policy/modules/services/devicekit.fc
---- nsaserefpolicy/policy/modules/services/devicekit.fc 2009-07-29 15:15:33.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/devicekit.fc 2010-03-18 10:44:43.000000000 -0400
-@@ -1,8 +1,12 @@
- /usr/libexec/devkit-daemon -- gen_context(system_u:object_r:devicekit_exec_t,s0)
- /usr/libexec/devkit-disks-daemon -- gen_context(system_u:object_r:devicekit_disk_exec_t,s0)
- /usr/libexec/devkit-power-daemon -- gen_context(system_u:object_r:devicekit_power_exec_t,s0)
-+/usr/libexec/udisks-daemon -- gen_context(system_u:object_r:devicekit_disk_exec_t,s0)
-+/usr/libexec/upowerd -- gen_context(system_u:object_r:devicekit_power_exec_t,s0)
-
- /var/lib/DeviceKit-.* gen_context(system_u:object_r:devicekit_var_lib_t,s0)
-+/var/lib/udisks(/.*)? gen_context(system_u:object_r:devicekit_var_lib_t,s0)
-
- /var/run/devkit(/.*)? gen_context(system_u:object_r:devicekit_var_run_t,s0)
--/var/run/DeviceKit-disk(/.*)? gen_context(system_u:object_r:devicekit_var_run_t,s0)
-+/var/run/DeviceKit-disks(/.*)? gen_context(system_u:object_r:devicekit_var_run_t,s0)
-+/var/run/udisks(/.*)? gen_context(system_u:object_r:devicekit_var_run_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/devicekit.if serefpolicy-3.7.15/policy/modules/services/devicekit.if
---- nsaserefpolicy/policy/modules/services/devicekit.if 2009-07-29 15:15:33.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/devicekit.if 2010-03-18 10:44:43.000000000 -0400
-@@ -139,6 +139,26 @@
-
- ########################################
- ##
-+## Manage devicekit var_run files.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`devicekit_manage_var_run',`
-+ gen_require(`
-+ type devicekit_var_run_t;
-+ ')
-+
-+ manage_dirs_pattern($1,devicekit_var_run_t,devicekit_var_run_t)
-+ manage_files_pattern($1,devicekit_var_run_t,devicekit_var_run_t)
-+ manage_lnk_files_pattern($1,devicekit_var_run_t,devicekit_var_run_t)
-+')
-+
-+########################################
-+##
- ## All of the rules required to administrate
- ## an devicekit environment
- ##
-@@ -162,7 +182,7 @@
- interface(`devicekit_admin',`
- gen_require(`
- type devicekit_t, devicekit_disk_t, devicekit_power_t;
-- type devicekit_var_run_t;
-+ type devicekit_var_lib_t, devicekit_var_run_t, devicekit_tmp_t;
- ')
-
- allow $1 devicekit_t:process { ptrace signal_perms getattr };
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/devicekit.te serefpolicy-3.7.15/policy/modules/services/devicekit.te
---- nsaserefpolicy/policy/modules/services/devicekit.te 2009-07-29 15:15:33.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/devicekit.te 2010-03-18 10:44:43.000000000 -0400
-@@ -42,6 +42,8 @@
-
- files_read_etc_files(devicekit_t)
-
-+kernel_read_system_state(devicekit_t)
-+
- miscfiles_read_localization(devicekit_t)
-
- optional_policy(`
-@@ -60,8 +62,10 @@
- # DeviceKit disk local policy
- #
-
--allow devicekit_disk_t self:capability { chown dac_override fowner fsetid sys_nice sys_ptrace sys_rawio };
-+allow devicekit_disk_t self:capability { chown setuid setgid dac_override fowner fsetid net_admin sys_admin sys_nice sys_ptrace sys_rawio };
-+allow devicekit_disk_t self:process { getsched signal_perms };
- allow devicekit_disk_t self:fifo_file rw_fifo_file_perms;
-+allow devicekit_disk_t self:netlink_kobject_uevent_socket create_socket_perms;
-
- manage_dirs_pattern(devicekit_disk_t, devicekit_tmp_t, devicekit_tmp_t)
- manage_files_pattern(devicekit_disk_t, devicekit_tmp_t, devicekit_tmp_t)
-@@ -71,29 +75,62 @@
- manage_files_pattern(devicekit_disk_t, devicekit_var_lib_t, devicekit_var_lib_t)
- files_var_lib_filetrans(devicekit_disk_t, devicekit_var_lib_t, dir)
-
-+allow devicekit_disk_t devicekit_var_run_t:dir mounton;
-+manage_dirs_pattern(devicekit_disk_t, devicekit_var_run_t, devicekit_var_run_t)
-+manage_files_pattern(devicekit_disk_t, devicekit_var_run_t, devicekit_var_run_t)
-+files_pid_filetrans(devicekit_disk_t, devicekit_var_run_t, { file dir })
-+
-+kernel_getattr_message_if(devicekit_disk_t)
-+kernel_read_fs_sysctls(devicekit_disk_t)
-+kernel_read_network_state(devicekit_disk_t)
- kernel_read_software_raid_state(devicekit_disk_t)
-+kernel_read_system_state(devicekit_disk_t)
-+kernel_request_load_module(devicekit_disk_t)
- kernel_setsched(devicekit_disk_t)
-
- corecmd_exec_bin(devicekit_disk_t)
-+corecmd_exec_shell(devicekit_disk_t)
-+corecmd_getattr_all_executables(devicekit_disk_t)
-
- dev_rw_sysfs(devicekit_disk_t)
- dev_read_urand(devicekit_disk_t)
- dev_getattr_usbfs_dirs(devicekit_disk_t)
--
-+dev_manage_generic_files(devicekit_disk_t)
-+dev_getattr_all_chr_files(devicekit_disk_t)
-+dev_getattr_mtrr_dev(devicekit_disk_t)
-+
-+domain_getattr_all_pipes(devicekit_disk_t)
-+domain_getattr_all_sockets(devicekit_disk_t)
-+domain_getattr_all_stream_sockets(devicekit_disk_t)
-+domain_read_all_domains_state(devicekit_disk_t)
-+
-+files_dontaudit_read_all_symlinks(devicekit_disk_t)
-+files_getattr_all_sockets(devicekit_disk_t)
-+files_getattr_all_mountpoints(devicekit_disk_t)
-+files_getattr_all_files(devicekit_disk_t)
-+files_manage_boot_dirs(devicekit_disk_t)
-+files_manage_isid_type_dirs(devicekit_disk_t)
- files_manage_mnt_dirs(devicekit_disk_t)
- files_read_etc_files(devicekit_disk_t)
- files_read_etc_runtime_files(devicekit_disk_t)
- files_read_usr_files(devicekit_disk_t)
-
-+fs_list_inotifyfs(devicekit_disk_t)
-+fs_manage_fusefs_dirs(devicekit_disk_t)
- fs_mount_all_fs(devicekit_disk_t)
- fs_unmount_all_fs(devicekit_disk_t)
--fs_manage_fusefs_dirs(devicekit_disk_t)
-+fs_search_all(devicekit_disk_t)
-
- storage_raw_read_fixed_disk(devicekit_disk_t)
- storage_raw_write_fixed_disk(devicekit_disk_t)
- storage_raw_read_removable_device(devicekit_disk_t)
- storage_raw_write_removable_device(devicekit_disk_t)
-
-+mls_file_read_all_levels(devicekit_disk_t)
-+mls_file_write_to_clearance(devicekit_disk_t)
-+
-+term_use_all_terms(devicekit_disk_t)
-+
- auth_use_nsswitch(devicekit_disk_t)
-
- miscfiles_read_localization(devicekit_disk_t)
-@@ -102,6 +139,16 @@
- userdom_search_user_home_dirs(devicekit_disk_t)
-
- optional_policy(`
-+ dbus_system_bus_client(devicekit_disk_t)
-+
-+ allow devicekit_disk_t devicekit_t:dbus send_msg;
-+
-+ optional_policy(`
-+ consolekit_dbus_chat(devicekit_disk_t)
-+ ')
-+')
-+
-+optional_policy(`
- fstools_domtrans(devicekit_disk_t)
- ')
-
-@@ -110,28 +157,27 @@
- ')
-
- optional_policy(`
-+ mount_domtrans(devicekit_disk_t)
-+')
-+
-+optional_policy(`
-+ policykit_dbus_chat(devicekit_disk_t)
- policykit_domtrans_auth(devicekit_disk_t)
- policykit_read_lib(devicekit_disk_t)
- policykit_read_reload(devicekit_disk_t)
- ')
-
- optional_policy(`
-- mount_domtrans(devicekit_disk_t)
-+ raid_domtrans_mdadm(devicekit_disk_t)
- ')
-
- optional_policy(`
-- dbus_system_bus_client(devicekit_disk_t)
--
-- allow devicekit_disk_t devicekit_t:dbus send_msg;
--
-- optional_policy(`
-- consolekit_dbus_chat(devicekit_disk_t)
-- ')
-+ udev_domtrans(devicekit_disk_t)
-+ udev_read_db(devicekit_disk_t)
- ')
-
- optional_policy(`
-- udev_domtrans(devicekit_disk_t)
-- udev_read_db(devicekit_disk_t)
-+ virt_manage_images(devicekit_disk_t)
- ')
-
- ########################################
-@@ -139,9 +185,11 @@
- # DeviceKit-Power local policy
- #
-
--allow devicekit_power_t self:capability { dac_override sys_tty_config sys_nice sys_ptrace };
-+allow devicekit_power_t self:capability { dac_override net_admin sys_admin sys_tty_config sys_nice sys_ptrace };
-+allow devicekit_power_t self:process getsched;
- allow devicekit_power_t self:fifo_file rw_fifo_file_perms;
- allow devicekit_power_t self:unix_dgram_socket create_socket_perms;
-+allow devicekit_power_t self:netlink_kobject_uevent_socket create_socket_perms;
-
- manage_dirs_pattern(devicekit_power_t, devicekit_var_lib_t, devicekit_var_lib_t)
- manage_files_pattern(devicekit_power_t, devicekit_var_lib_t, devicekit_var_lib_t)
-@@ -151,6 +199,8 @@
- kernel_read_system_state(devicekit_power_t)
- kernel_rw_hotplug_sysctls(devicekit_power_t)
- kernel_rw_kernel_sysctl(devicekit_power_t)
-+kernel_search_debugfs(devicekit_power_t)
-+kernel_write_proc_files(devicekit_power_t)
-
- corecmd_exec_bin(devicekit_power_t)
- corecmd_exec_shell(devicekit_power_t)
-@@ -159,7 +209,9 @@
-
- domain_read_all_domains_state(devicekit_power_t)
-
-+dev_read_input(devicekit_power_t)
- dev_rw_generic_usb_dev(devicekit_power_t)
-+dev_rw_generic_chr_files(devicekit_power_t)
- dev_rw_netcontrol(devicekit_power_t)
- dev_rw_sysfs(devicekit_power_t)
-
-@@ -167,12 +219,17 @@
- files_read_etc_files(devicekit_power_t)
- files_read_usr_files(devicekit_power_t)
-
-+fs_list_inotifyfs(devicekit_power_t)
-+
- term_use_all_terms(devicekit_power_t)
-
- auth_use_nsswitch(devicekit_power_t)
-
- miscfiles_read_localization(devicekit_power_t)
-
-+sysnet_read_config(devicekit_power_t)
-+sysnet_domtrans_ifconfig(devicekit_power_t)
-+
- userdom_read_all_users_state(devicekit_power_t)
-
- optional_policy(`
-@@ -180,6 +237,10 @@
- ')
-
- optional_policy(`
-+ cron_initrc_domtrans(devicekit_power_t)
-+')
-+
-+optional_policy(`
- dbus_system_bus_client(devicekit_power_t)
-
- allow devicekit_power_t devicekit_t:dbus send_msg;
-@@ -203,17 +264,23 @@
-
- optional_policy(`
- hal_domtrans_mac(devicekit_power_t)
-+ hal_manage_log(devicekit_power_t)
- hal_manage_pid_dirs(devicekit_power_t)
- hal_manage_pid_files(devicekit_power_t)
- hal_dbus_chat(devicekit_power_t)
- ')
-
- optional_policy(`
-+ policykit_dbus_chat(devicekit_power_t)
- policykit_domtrans_auth(devicekit_power_t)
- policykit_read_lib(devicekit_power_t)
- policykit_read_reload(devicekit_power_t)
- ')
-
- optional_policy(`
-+ udev_read_db(devicekit_power_t)
-+')
-+
-+optional_policy(`
- vbetool_domtrans(devicekit_power_t)
- ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dhcp.te serefpolicy-3.7.15/policy/modules/services/dhcp.te
---- nsaserefpolicy/policy/modules/services/dhcp.te 2010-02-12 10:33:09.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/dhcp.te 2010-03-18 10:44:43.000000000 -0400
-@@ -112,6 +112,10 @@
- ')
-
- optional_policy(`
-+ cobbler_dontaudit_rw_log(dhcpd_t)
-+')
-+
-+optional_policy(`
- dbus_system_bus_client(dhcpd_t)
- dbus_connect_system_bus(dhcpd_t)
- ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/djbdns.if serefpolicy-3.7.15/policy/modules/services/djbdns.if
---- nsaserefpolicy/policy/modules/services/djbdns.if 2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/djbdns.if 2010-03-18 10:44:43.000000000 -0400
-@@ -26,6 +26,8 @@
- daemontools_read_svc(djbdns_$1_t)
-
- allow djbdns_$1_t self:capability { net_bind_service setgid setuid sys_chroot };
-+ allow djbdns_$1_t self:process signal;
-+ allow djbdns_$1_t self:fifo_file rw_fifo_file_perms;
- allow djbdns_$1_t self:tcp_socket create_stream_socket_perms;
- allow djbdns_$1_t self:udp_socket create_socket_perms;
-
-@@ -50,3 +52,39 @@
-
- files_search_var(djbdns_$1_t)
- ')
-+
-+#####################################
-+##
-+## Allow search the djbdns-tinydns key ring.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`djbdns_search_key_tinydns',`
-+ gen_require(`
-+ type djbdns_tinydns_t;
-+ ')
-+
-+ allow $1 djbdns_tinydns_t:key search;
-+')
-+
-+#####################################
-+##
-+## Allow link to the djbdns-tinydns key ring.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`djbdns_link_key_tinydns',`
-+ gen_require(`
-+ type djbdns_tinydn_t;
-+ ')
-+
-+ allow $1 djbdns_tinydn_t:key link;
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/djbdns.te serefpolicy-3.7.15/policy/modules/services/djbdns.te
---- nsaserefpolicy/policy/modules/services/djbdns.te 2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/djbdns.te 2010-03-18 10:44:43.000000000 -0400
-@@ -42,3 +42,11 @@
- files_search_var(djbdns_axfrdns_t)
-
- ucspitcp_service_domain(djbdns_axfrdns_t, djbdns_axfrdns_exec_t)
-+
-+#####################################
-+#
-+# Local policy for djbdns_tinydns_t
-+#
-+
-+init_dontaudit_use_script_fds(djbdns_tinydns_t)
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dnsmasq.fc serefpolicy-3.7.15/policy/modules/services/dnsmasq.fc
---- nsaserefpolicy/policy/modules/services/dnsmasq.fc 2010-02-12 10:33:09.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/dnsmasq.fc 2010-03-18 10:44:43.000000000 -0400
-@@ -6,5 +6,7 @@
- /var/lib/misc/dnsmasq\.leases -- gen_context(system_u:object_r:dnsmasq_lease_t,s0)
- /var/lib/dnsmasq(/.*)? gen_context(system_u:object_r:dnsmasq_lease_t,s0)
-
-+/var/log/dnsmasq\.log gen_context(system_u:object_r:dnsmasq_var_log_t,s0)
-+
- /var/run/dnsmasq\.pid -- gen_context(system_u:object_r:dnsmasq_var_run_t,s0)
- /var/run/libvirt/network(/.*)? gen_context(system_u:object_r:dnsmasq_var_run_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dnsmasq.if serefpolicy-3.7.15/policy/modules/services/dnsmasq.if
---- nsaserefpolicy/policy/modules/services/dnsmasq.if 2010-02-12 10:33:09.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/dnsmasq.if 2010-03-18 10:44:43.000000000 -0400
-@@ -111,7 +111,7 @@
- type dnsmasq_etc_t;
- ')
-
-- allow $1 dnsmasq_etc_t:file read_file_perms;
-+ read_files_pattern($1, dnsmasq_etc_t, dnsmasq_etc_t)
- files_search_etc($1)
- ')
-
-@@ -130,7 +130,7 @@
- type dnsmasq_etc_t;
- ')
-
-- allow $1 dnsmasq_etc_t:file write_file_perms;
-+ write_files_pattern($1, dnsmasq_etc_t, dnsmasq_etc_t)
- files_search_etc($1)
- ')
-
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dnsmasq.te serefpolicy-3.7.15/policy/modules/services/dnsmasq.te
---- nsaserefpolicy/policy/modules/services/dnsmasq.te 2010-02-12 10:33:09.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/dnsmasq.te 2010-03-18 10:44:43.000000000 -0400
-@@ -19,6 +19,9 @@
- type dnsmasq_lease_t;
- files_type(dnsmasq_lease_t)
-
-+type dnsmasq_var_log_t;
-+logging_log_file(dnsmasq_var_log_t)
-+
- type dnsmasq_var_run_t;
- files_pid_file(dnsmasq_var_run_t)
-
-@@ -27,7 +30,7 @@
- # Local policy
- #
-
--allow dnsmasq_t self:capability { net_admin setgid setuid net_bind_service net_raw };
-+allow dnsmasq_t self:capability { chown dac_override net_admin setgid setuid net_bind_service net_raw };
- dontaudit dnsmasq_t self:capability sys_tty_config;
- allow dnsmasq_t self:process { getcap setcap signal_perms };
- allow dnsmasq_t self:fifo_file rw_fifo_file_perms;
-@@ -37,12 +40,15 @@
- allow dnsmasq_t self:packet_socket create_socket_perms;
- allow dnsmasq_t self:rawip_socket create_socket_perms;
-
--allow dnsmasq_t dnsmasq_etc_t:file read_file_perms;
-+read_files_pattern(dnsmasq_t, dnsmasq_etc_t, dnsmasq_etc_t)
-
- # dhcp leases
- manage_files_pattern(dnsmasq_t, dnsmasq_lease_t, dnsmasq_lease_t)
- files_var_lib_filetrans(dnsmasq_t, dnsmasq_lease_t, file)
-
-+manage_files_pattern(dnsmasq_t, dnsmasq_var_log_t, dnsmasq_var_log_t)
-+logging_log_filetrans(dnsmasq_t, dnsmasq_var_log_t, file)
-+
- manage_files_pattern(dnsmasq_t, dnsmasq_var_run_t, dnsmasq_var_run_t)
- files_pid_filetrans(dnsmasq_t, dnsmasq_var_run_t, file)
-
-@@ -87,6 +93,18 @@
- userdom_dontaudit_search_user_home_dirs(dnsmasq_t)
-
- optional_policy(`
-+ cobbler_read_lib_files(dnsmasq_t)
-+')
-+
-+optional_policy(`
-+ cron_manage_pid_files(dnsmasq_t)
-+')
-+
-+optional_policy(`
-+ dbus_system_bus_client(dnsmasq_t)
-+')
-+
-+optional_policy(`
- seutil_sigchld_newrole(dnsmasq_t)
- ')
-
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.fc serefpolicy-3.7.15/policy/modules/services/dovecot.fc
---- nsaserefpolicy/policy/modules/services/dovecot.fc 2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/dovecot.fc 2010-03-18 10:44:43.000000000 -0400
-@@ -34,6 +34,7 @@
-
- /var/lib/dovecot(/.*)? gen_context(system_u:object_r:dovecot_var_lib_t,s0)
-
-+/var/log/dovecot(/.*)? gen_context(system_u:object_r:dovecot_var_log_t,s0)
- /var/log/dovecot\.log.* gen_context(system_u:object_r:dovecot_var_log_t,s0)
-
- /var/spool/dovecot(/.*)? gen_context(system_u:object_r:dovecot_spool_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-3.7.15/policy/modules/services/dovecot.te
---- nsaserefpolicy/policy/modules/services/dovecot.te 2010-01-07 14:53:53.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/dovecot.te 2010-03-18 10:44:43.000000000 -0400
-@@ -73,14 +73,21 @@
-
- can_exec(dovecot_t, dovecot_exec_t)
-
-+# Allow dovecot to create and read SSL parameters file
-+manage_files_pattern(dovecot_t, dovecot_var_lib_t, dovecot_var_lib_t)
-+files_search_var_lib(dovecot_t)
-+files_read_var_symlinks(dovecot_t)
-+
-+manage_dirs_pattern(dovecot_t, dovecot_var_log_t, dovecot_var_log_t)
- manage_files_pattern(dovecot_t, dovecot_var_log_t, dovecot_var_log_t)
--logging_log_filetrans(dovecot_t, dovecot_var_log_t, file)
-+logging_log_filetrans(dovecot_t, dovecot_var_log_t, { file dir })
-
- manage_dirs_pattern(dovecot_t, dovecot_spool_t, dovecot_spool_t)
- manage_files_pattern(dovecot_t, dovecot_spool_t, dovecot_spool_t)
- manage_lnk_files_pattern(dovecot_t, dovecot_spool_t, dovecot_spool_t)
-
- manage_files_pattern(dovecot_t, dovecot_var_run_t, dovecot_var_run_t)
-+manage_lnk_files_pattern(dovecot_t, dovecot_var_run_t, dovecot_var_run_t)
- manage_sock_files_pattern(dovecot_t, dovecot_var_run_t, dovecot_var_run_t)
- files_pid_filetrans(dovecot_t, dovecot_var_run_t, file)
-
-@@ -93,6 +100,7 @@
- corenet_tcp_sendrecv_generic_node(dovecot_t)
- corenet_tcp_sendrecv_all_ports(dovecot_t)
- corenet_tcp_bind_generic_node(dovecot_t)
-+corenet_tcp_bind_mail_port(dovecot_t)
- corenet_tcp_bind_pop_port(dovecot_t)
- corenet_tcp_connect_all_ports(dovecot_t)
- corenet_tcp_connect_postgresql_port(dovecot_t)
-@@ -103,6 +111,7 @@
- dev_read_urand(dovecot_t)
-
- fs_getattr_all_fs(dovecot_t)
-+fs_getattr_all_dirs(dovecot_t)
- fs_search_auto_mountpoints(dovecot_t)
- fs_list_inotifyfs(dovecot_t)
-
-@@ -142,6 +151,10 @@
- ')
-
- optional_policy(`
-+ postgresql_stream_connect(dovecot_t)
-+')
-+
-+optional_policy(`
- seutil_sigchld_newrole(dovecot_t)
- ')
-
-@@ -172,11 +185,6 @@
- manage_files_pattern(dovecot_auth_t, dovecot_auth_tmp_t, dovecot_auth_tmp_t)
- files_tmp_filetrans(dovecot_auth_t, dovecot_auth_tmp_t, { file dir })
-
--# Allow dovecot to create and read SSL parameters file
--manage_files_pattern(dovecot_t, dovecot_var_lib_t, dovecot_var_lib_t)
--files_search_var_lib(dovecot_t)
--files_read_var_symlinks(dovecot_t)
--
- allow dovecot_auth_t dovecot_var_run_t:dir list_dir_perms;
- manage_sock_files_pattern(dovecot_auth_t, dovecot_var_run_t, dovecot_var_run_t)
- dovecot_stream_connect_auth(dovecot_auth_t)
-@@ -197,8 +205,8 @@
- files_search_pids(dovecot_auth_t)
- files_read_usr_files(dovecot_auth_t)
- files_read_usr_symlinks(dovecot_auth_t)
-+files_read_var_lib_files(dovecot_auth_t)
- files_search_tmp(dovecot_auth_t)
--files_read_var_lib_files(dovecot_t)
-
- init_rw_utmp(dovecot_auth_t)
-
-@@ -225,6 +233,7 @@
- ')
-
- optional_policy(`
-+ postfix_manage_private_sockets(dovecot_auth_t)
- postfix_search_spool(dovecot_auth_t)
- ')
-
-@@ -234,6 +243,8 @@
- #
- allow dovecot_deliver_t self:unix_dgram_socket create_socket_perms;
-
-+allow dovecot_deliver_t dovecot_t:process signull;
-+
- allow dovecot_deliver_t dovecot_etc_t:file read_file_perms;
- allow dovecot_deliver_t dovecot_var_run_t:dir list_dir_perms;
-
-@@ -246,6 +257,7 @@
- auth_use_nsswitch(dovecot_deliver_t)
-
- logging_send_syslog_msg(dovecot_deliver_t)
-+logging_search_logs(dovecot_auth_t)
-
- miscfiles_read_localization(dovecot_deliver_t)
-
-@@ -263,11 +275,19 @@
- userdom_user_home_dir_filetrans_user_home_content(dovecot_deliver_t, { dir file lnk_file fifo_file sock_file })
-
- tunable_policy(`use_nfs_home_dirs',`
-+ fs_manage_nfs_dirs(dovecot_deliver_t)
-+ fs_manage_nfs_files(dovecot_deliver_t)
-+ fs_manage_nfs_symlinks(dovecot_deliver_t)
-+ fs_manage_nfs_dirs(dovecot_t)
- fs_manage_nfs_files(dovecot_t)
- fs_manage_nfs_symlinks(dovecot_t)
- ')
-
- tunable_policy(`use_samba_home_dirs',`
-+ fs_manage_cifs_dirs(dovecot_deliver_t)
-+ fs_manage_cifs_files(dovecot_deliver_t)
-+ fs_manage_cifs_symlinks(dovecot_deliver_t)
-+ fs_manage_cifs_dirs(dovecot_t)
- fs_manage_cifs_files(dovecot_t)
- fs_manage_cifs_symlinks(dovecot_t)
- ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail2ban.if serefpolicy-3.7.15/policy/modules/services/fail2ban.if
---- nsaserefpolicy/policy/modules/services/fail2ban.if 2010-03-18 06:48:09.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/fail2ban.if 2010-03-18 10:44:43.000000000 -0400
-@@ -138,6 +138,26 @@
-
- ########################################
- ##
-+## dontaudit read and write an leaked file descriptors
-+##
-+##
-+##
-+## The type of the process performing this action.
-+##
-+##
-+#
-+interface(`fail2ban_dontaudit_leaks',`
-+ gen_require(`
-+ type fail2ban_t;
-+ ')
-+
-+ dontaudit $1 fail2ban_t:tcp_socket { read write };
-+ dontaudit $1 fail2ban_t:unix_dgram_socket { read write };
-+ dontaudit $1 fail2ban_t:unix_stream_socket { read write };
-+')
-+
-+########################################
-+##
- ## All of the rules required to administrate
- ## an fail2ban environment
- ##
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fprintd.te serefpolicy-3.7.15/policy/modules/services/fprintd.te
---- nsaserefpolicy/policy/modules/services/fprintd.te 2010-01-07 14:53:53.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/fprintd.te 2010-03-18 10:44:43.000000000 -0400
-@@ -55,4 +55,6 @@
- policykit_read_lib(fprintd_t)
- policykit_dbus_chat(fprintd_t)
- policykit_domtrans_auth(fprintd_t)
-+ policykit_dbus_chat_auth(fprintd_t)
- ')
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.fc serefpolicy-3.7.15/policy/modules/services/ftp.fc
---- nsaserefpolicy/policy/modules/services/ftp.fc 2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/ftp.fc 2010-03-18 10:44:43.000000000 -0400
-@@ -22,7 +22,7 @@
- #
- # /var
- #
--/var/run/proftpd(/.*)? gen_context(system_u:object_r:ftpd_var_run_t,s0)
-+/var/run/proftpd.* gen_context(system_u:object_r:ftpd_var_run_t,s0)
-
- /var/log/muddleftpd\.log.* -- gen_context(system_u:object_r:xferlog_t,s0)
- /var/log/proftpd(/.*)? gen_context(system_u:object_r:xferlog_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.if serefpolicy-3.7.15/policy/modules/services/ftp.if
---- nsaserefpolicy/policy/modules/services/ftp.if 2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/ftp.if 2010-03-18 10:44:43.000000000 -0400
-@@ -115,6 +115,44 @@
- role $2 types ftpdctl_t;
- ')
-
-+#######################################
-+##
-+## Allow domain dyntransition to sftpd domain.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`ftp_dyntransition_sftpd',`
-+ gen_require(`
-+ type sftpd_t;
-+ ')
-+
-+ allow $1 sftpd_t:process dyntransition;
-+ allow sftpd_t $1:process sigchld;
-+')
-+
-+#######################################
-+##
-+## Allow domain dyntransition to sftpd_anon domain.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`ftp_dyntransition_sftpd_anon',`
-+ gen_require(`
-+ type sftpd_anon_t;
-+ ')
-+
-+ allow $1 sftpd_anon_t:process dyntransition;
-+ allow sftpd_anon_t $1:process sigchld;
-+')
-+
- ########################################
- ##
- ## All of the rules required to administrate
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-3.7.15/policy/modules/services/ftp.te
---- nsaserefpolicy/policy/modules/services/ftp.te 2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/ftp.te 2010-03-18 10:44:43.000000000 -0400
-@@ -41,11 +41,51 @@
-
- ##
- ##
-+## Allow ftp servers to use connect to mysql database
-+##
-+##
-+gen_tunable(ftpd_connect_db, false)
-+
-+##
-+##
- ## Allow ftp to read and write files in the user home directories
- ##
- ##
- gen_tunable(ftp_home_dir, false)
-
-+##
-+##
-+## Allow anon internal-sftp to upload files, used for
-+## public file transfer services. Directories must be labeled
-+## public_content_rw_t.
-+##
-+##
-+gen_tunable(sftpd_anon_write, false)
-+
-+##
-+##
-+## Allow sftp-internal to login to local users and
-+## read/write all files on the system, governed by DAC.
-+##
-+##
-+gen_tunable(sftpd_full_access, false)
-+
-+##
-+##
-+## Allow interlnal-sftp to read and write files
-+## in the user ssh home directories.
-+##
-+##
-+gen_tunable(sftpd_write_ssh_home, false)
-+
-+##
-+##
-+## Allow sftp-internal to read and write files
-+## in the user home directories
-+##
-+##
-+gen_tunable(sftpd_enable_homedirs, false)
-+
- type ftpd_t;
- type ftpd_exec_t;
- init_daemon_domain(ftpd_t, ftpd_exec_t)
-@@ -78,20 +118,37 @@
- type xferlog_t;
- logging_log_file(xferlog_t)
-
-+ifdef(`enable_mcs',`
-+ init_ranged_daemon_domain(ftpd_t, ftpd_exec_t, s0 - mcs_systemhigh)
-+')
-+
-+ifdef(`enable_mls',`
-+ init_ranged_daemon_domain(ftpd_t, ftpd_exec_t, mls_systemhigh)
-+')
-+
-+type sftpd_t;
-+domain_type(sftpd_t)
-+role system_r types sftpd_t;
-+
-+type sftpd_anon_t;
-+domain_type(sftpd_anon_t)
-+role system_r types sftpd_anon_t;
-+
- ########################################
- #
- # ftpd local policy
- #
-
--allow ftpd_t self:capability { chown fowner fsetid setgid setuid sys_chroot sys_nice sys_resource };
-+allow ftpd_t self:capability { chown fowner fsetid setgid setuid sys_chroot sys_admin sys_nice sys_resource };
- dontaudit ftpd_t self:capability sys_tty_config;
--allow ftpd_t self:process signal_perms;
--allow ftpd_t self:process { getcap setcap setsched setrlimit };
-+allow ftpd_t self:process { getcap getpgid setcap setsched setrlimit signal_perms };
- allow ftpd_t self:fifo_file rw_fifo_file_perms;
- allow ftpd_t self:unix_dgram_socket { sendto create_socket_perms };
- allow ftpd_t self:unix_stream_socket create_stream_socket_perms;
- allow ftpd_t self:tcp_socket create_stream_socket_perms;
- allow ftpd_t self:udp_socket create_socket_perms;
-+allow ftpd_t self:shm create_shm_perms;
-+allow ftpd_t self:key manage_key_perms;
-
- allow ftpd_t ftpd_etc_t:file read_file_perms;
-
-@@ -121,8 +178,7 @@
- allow ftpd_t ftpdctl_tmp_t:sock_file { getattr unlink };
-
- # Create and modify /var/log/xferlog.
--allow ftpd_t xferlog_t:dir search_dir_perms;
--allow ftpd_t xferlog_t:file manage_file_perms;
-+manage_files_pattern(ftpd_t, xferlog_t, xferlog_t)
- logging_log_filetrans(ftpd_t, xferlog_t, file)
-
- kernel_read_kernel_sysctls(ftpd_t)
-@@ -160,6 +216,7 @@
-
- fs_search_auto_mountpoints(ftpd_t)
- fs_getattr_all_fs(ftpd_t)
-+fs_search_fusefs(ftpd_t)
-
- auth_use_nsswitch(ftpd_t)
- auth_domtrans_chk_passwd(ftpd_t)
-@@ -219,10 +276,14 @@
- # allow access to /home
- files_list_home(ftpd_t)
- userdom_read_user_home_content_files(ftpd_t)
-- userdom_manage_user_home_content_dirs(ftpd_t)
-- userdom_manage_user_home_content_files(ftpd_t)
-- userdom_manage_user_home_content_symlinks(ftpd_t)
-- userdom_user_home_dir_filetrans_user_home_content(ftpd_t, { dir file lnk_file })
-+ userdom_manage_user_home_content(ftpd_t)
-+
-+ auth_read_all_dirs_except_shadow(ftpd_t)
-+ auth_read_all_files_except_shadow(ftpd_t)
-+ auth_read_all_symlinks_except_shadow(ftpd_t)
-+', `
-+ # Needed for permissive mode, to make sure everything gets labeled correctly
-+ userdom_user_home_dir_filetrans_pattern(ftpd_t, { dir file lnk_file })
- ')
-
- tunable_policy(`ftp_home_dir && use_nfs_home_dirs',`
-@@ -258,7 +319,26 @@
- ')
-
- optional_policy(`
-- kerberos_read_keytab(ftpd_t)
-+ kerberos_keytab_template(ftpd, ftpd_t)
-+ kerberos_manage_host_rcache(ftpd_t)
-+ selinux_validate_context(ftpd_t)
-+')
-+
-+optional_policy(`
-+ tunable_policy(`ftpd_connect_db',`
-+ mysql_stream_connect(ftpd_t)
-+ ')
-+')
-+
-+optional_policy(`
-+ tunable_policy(`ftpd_connect_db',`
-+ postgresql_stream_connect(ftpd_t)
-+ ')
-+')
-+
-+tunable_policy(`ftpd_connect_db',`
-+ corenet_tcp_connect_mysqld_port(ftpd_t)
-+ corenet_tcp_connect_postgresql_port(ftpd_t)
- ')
-
- optional_policy(`
-@@ -270,6 +350,14 @@
- ')
-
- optional_policy(`
-+ dbus_system_bus_client(ftpd_t)
-+ optional_policy(`
-+ oddjob_dbus_chat(ftpd_t)
-+ oddjob_domtrans_mkhomedir(ftpd_t)
-+ ')
-+')
-+
-+optional_policy(`
- seutil_sigchld_newrole(ftpd_t)
- ')
-
-@@ -294,3 +382,74 @@
- files_read_etc_files(ftpdctl_t)
-
- userdom_use_user_terminals(ftpdctl_t)
-+
-+########################################
-+#
-+# sftpd-anon local policy
-+#
-+files_read_etc_files(sftpd_anon_t)
-+
-+miscfiles_read_public_files(sftpd_anon_t)
-+
-+tunable_policy(`sftpd_anon_write',`
-+ miscfiles_manage_public_files(sftpd_anon_t)
-+')
-+
-+########################################
-+#
-+# sftpd local policy
-+#
-+files_read_etc_files(sftpd_t)
-+
-+# allow read access to /home by default
-+userdom_read_user_home_content_files(sftpd_t)
-+userdom_read_user_home_content_symlinks(sftpd_t)
-+userdom_dontaudit_list_admin_dir(sftpd_t)
-+
-+tunable_policy(`sftpd_full_access',`
-+ allow sftpd_t self:capability { dac_override dac_read_search };
-+ fs_read_noxattr_fs_files(sftpd_t)
-+ auth_manage_all_files_except_shadow(sftpd_t)
-+')
-+
-+tunable_policy(`sftpd_write_ssh_home',`
-+ ssh_manage_user_home_files(sftpd_t)
-+')
-+
-+tunable_policy(`sftpd_enable_homedirs',`
-+ allow sftpd_t self:capability { dac_override dac_read_search };
-+
-+ # allow access to /home
-+ files_list_home(sftpd_t)
-+ userdom_read_user_home_content_files(sftpd_t)
-+ userdom_manage_user_home_content(sftpd_t)
-+
-+ auth_read_all_dirs_except_shadow(sftpd_t)
-+ auth_read_all_files_except_shadow(sftpd_t)
-+ auth_read_all_symlinks_except_shadow(sftpd_t)
-+', `
-+ # Needed for permissive mode, to make sure everything gets labeled correctly
-+ userdom_user_home_dir_filetrans_pattern(sftpd_t, { dir file lnk_file })
-+')
-+
-+tunable_policy(`sftpd_enable_homedirs && use_nfs_home_dirs',`
-+ fs_manage_nfs_dirs(sftpd_t)
-+ fs_manage_nfs_files(sftpd_t)
-+ fs_manage_nfs_symlinks(sftpd_t)
-+')
-+
-+tunable_policy(`sftpd_enable_homedirs && use_samba_home_dirs',`
-+ fs_manage_cifs_dirs(sftpd_t)
-+ fs_manage_cifs_files(sftpd_t)
-+ fs_manage_cifs_symlinks(sftpd_t)
-+')
-+
-+tunable_policy(`use_samba_home_dirs',`
-+ fs_read_cifs_files(sftpd_t)
-+ fs_read_cifs_symlinks(sftpd_t)
-+')
-+
-+tunable_policy(`use_nfs_home_dirs',`
-+ fs_read_nfs_files(sftpd_t)
-+ fs_read_nfs_symlinks(ftpd_t)
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/git.fc serefpolicy-3.7.15/policy/modules/services/git.fc
---- nsaserefpolicy/policy/modules/services/git.fc 2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/git.fc 2010-03-18 10:44:43.000000000 -0400
-@@ -1,3 +1,16 @@
--/var/cache/cgit(/.*)? gen_context(system_u:object_r:httpd_git_script_rw_t,s0)
--/var/lib/git(/.*)? gen_context(system_u:object_r:httpd_git_content_t,s0)
--/var/www/cgi-bin/cgit -- gen_context(system_u:object_r:httpd_git_script_exec_t,s0)
-+HOME_DIR/public_git(/.*)? gen_context(system_u:object_r:git_session_content_t, s0)
-+HOME_DIR/\.gitconfig -- gen_context(system_u:object_r:git_session_content_t, s0)
-+
-+/srv/git(/.*)? gen_context(system_u:object_r:git_system_content_t, s0)
-+
-+/usr/libexec/git-core/git-daemon -- gen_context(system_u:object_r:gitd_exec_t, s0)
-+
-+/var/cache/cgit(/.*)? gen_context(system_u:object_r:httpd_git_content_rw_t,s0)
-+/var/www/cgi-bin/cgit -- gen_context(system_u:object_r:httpd_git_script_exec_t,s0)
-+
-+/var/www/git(/.*)? gen_context(system_u:object_r:httpd_git_content_t,s0)
-+
-+/var/www/git/gitweb.cgi gen_context(system_u:object_r:httpd_git_script_exec_t,s0)
-+
-+/var/lib/git(/.*)? gen_context(system_u:object_r:git_system_content_t, s0)
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/git.if serefpolicy-3.7.15/policy/modules/services/git.if
---- nsaserefpolicy/policy/modules/services/git.if 2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/git.if 2010-03-18 10:44:43.000000000 -0400
-@@ -1 +1,535 @@
--## GIT revision control system
-+## Git - Fast Version Control System.
-+##
-+##
-+## A really simple TCP git daemon that normally listens on
-+## port DEFAULT_GIT_PORT aka 9418. It waits for a
-+## connection asking for a service, and will serve that
-+## service if it is enabled.
-+##
-+##
-+
-+#######################################
-+##
-+## Role access for Git daemon session.
-+##
-+##
-+##
-+## Role allowed access.
-+##
-+##
-+##
-+##
-+## User domain for the role.
-+##
-+##
-+#
-+interface(`git_session_role',`
-+ gen_require(`
-+ type git_session_t, gitd_exec_t;
-+ ')
-+
-+ ########################################
-+ #
-+ # Git daemon session shared declarations.
-+ #
-+
-+ role $1 types git_session_t;
-+
-+ ########################################
-+ #
-+ # Git daemon session shared policy.
-+ #
-+
-+ domtrans_pattern($2, gitd_exec_t, git_session_t)
-+
-+ allow $2 git_session_t:process { ptrace signal_perms };
-+ ps_process_pattern($2, git_session_t)
-+')
-+
-+########################################
-+##
-+## Create a set of derived types for Git
-+## daemon shared repository content.
-+##
-+##
-+##
-+## The prefix to be used for deriving type names.
-+##
-+##
-+#
-+template(`git_content_template',`
-+
-+ gen_require(`
-+ attribute git_system_content;
-+ attribute git_content;
-+ ')
-+
-+ ########################################
-+ #
-+ # Git daemon content shared declarations.
-+ #
-+
-+ type git_$1_content_t, git_system_content, git_content;
-+ files_type(git_$1_content_t)
-+')
-+
-+########################################
-+##
-+## Create a set of derived types for Git
-+## daemon shared repository roles.
-+##
-+##
-+##
-+## The prefix to be used for deriving type names.
-+##
-+##
-+#
-+template(`git_role_template',`
-+
-+ gen_require(`
-+ class context contains;
-+ role system_r;
-+ ')
-+
-+ ########################################
-+ #
-+ # Git daemon role shared declarations.
-+ #
-+
-+ attribute $1_usertype;
-+
-+ type $1_t;
-+ userdom_unpriv_usertype($1, $1_t)
-+ domain_type($1_t)
-+
-+ role $1_r types $1_t;
-+ allow system_r $1_r;
-+
-+ ########################################
-+ #
-+ # Git daemon role shared policy.
-+ #
-+
-+ allow $1_t self:context contains;
-+ allow $1_t self:fifo_file rw_fifo_file_perms;
-+
-+ corecmd_exec_bin($1_t)
-+ corecmd_bin_entry_type($1_t)
-+ corecmd_shell_entry_type($1_t)
-+
-+ domain_interactive_fd($1_t)
-+ domain_user_exemption_target($1_t)
-+
-+ kernel_read_system_state($1_t)
-+
-+ files_read_etc_files($1_t)
-+ files_dontaudit_search_home($1_t)
-+
-+ miscfiles_read_localization($1_t)
-+
-+ git_rwx_generic_system_content($1_t)
-+
-+ ssh_rw_stream_sockets($1_t)
-+
-+ tunable_policy(`git_system_use_cifs',`
-+ fs_exec_cifs_files($1_t)
-+ fs_manage_cifs_dirs($1_t)
-+ fs_manage_cifs_files($1_t)
-+ ')
-+
-+ tunable_policy(`git_system_use_nfs',`
-+ fs_exec_nfs_files($1_t)
-+ fs_manage_nfs_dirs($1_t)
-+ fs_manage_nfs_files($1_t)
-+ ')
-+
-+ optional_policy(`
-+ nscd_read_pid($1_t)
-+ ')
-+')
-+
-+#######################################
-+##
-+## Allow specified domain access to the
-+## specified Git daemon content.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+##
-+##
-+## Type of the object that access is allowed to.
-+##
-+##
-+#
-+interface(`git_content_delegation',`
-+ gen_require(`
-+ type $1, $2;
-+ ')
-+
-+ exec_files_pattern($1, $2, $2)
-+ manage_dirs_pattern($1, $2, $2)
-+ manage_files_pattern($1, $2, $2)
-+ files_search_var($1)
-+
-+ tunable_policy(`git_system_use_cifs',`
-+ fs_exec_cifs_files($1)
-+ fs_manage_cifs_dirs($1)
-+ fs_manage_cifs_files($1)
-+ ')
-+
-+ tunable_policy(`git_system_use_nfs',`
-+ fs_exec_nfs_files($1)
-+ fs_manage_nfs_dirs($1)
-+ fs_manage_nfs_files($1)
-+ ')
-+')
-+
-+########################################
-+##
-+## Allow the specified domain to manage
-+## and execute all Git daemon content.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+##
-+#
-+interface(`git_rwx_all_content',`
-+ gen_require(`
-+ attribute git_content;
-+ ')
-+
-+ exec_files_pattern($1, git_content, git_content)
-+ manage_dirs_pattern($1, git_content, git_content)
-+ manage_files_pattern($1, git_content, git_content)
-+ userdom_search_user_home_dirs($1)
-+ files_search_var($1)
-+
-+ tunable_policy(`use_nfs_home_dirs',`
-+ fs_exec_nfs_files($1)
-+ fs_manage_nfs_dirs($1)
-+ fs_manage_nfs_files($1)
-+ ')
-+
-+ tunable_policy(`use_samba_home_dirs',`
-+ fs_exec_cifs_files($1)
-+ fs_manage_cifs_dirs($1)
-+ fs_manage_cifs_files($1)
-+ ')
-+
-+ tunable_policy(`git_system_use_cifs',`
-+ fs_exec_cifs_files($1)
-+ fs_manage_cifs_dirs($1)
-+ fs_manage_cifs_files($1)
-+ ')
-+
-+ tunable_policy(`git_system_use_nfs',`
-+ fs_exec_nfs_files($1)
-+ fs_manage_nfs_dirs($1)
-+ fs_manage_nfs_files($1)
-+ ')
-+')
-+
-+########################################
-+##
-+## Allow the specified domain to manage
-+## and execute all Git daemon system content.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+##
-+#
-+interface(`git_rwx_all_system_content',`
-+ gen_require(`
-+ attribute git_system_content;
-+ ')
-+
-+ exec_files_pattern($1, git_system_content, git_system_content)
-+ manage_dirs_pattern($1, git_system_content, git_system_content)
-+ manage_files_pattern($1, git_system_content, git_system_content)
-+ files_search_var($1)
-+
-+ tunable_policy(`git_system_use_cifs',`
-+ fs_exec_cifs_files($1)
-+ fs_manage_cifs_dirs($1)
-+ fs_manage_cifs_files($1)
-+ ')
-+
-+ tunable_policy(`git_system_use_nfs',`
-+ fs_exec_nfs_files($1)
-+ fs_manage_nfs_dirs($1)
-+ fs_manage_nfs_files($1)
-+ ')
-+')
-+
-+########################################
-+##
-+## Allow the specified domain to manage
-+## and execute Git daemon generic system content.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+##
-+#
-+interface(`git_rwx_generic_system_content',`
-+ gen_require(`
-+ type git_system_content_t;
-+ ')
-+
-+ exec_files_pattern($1, git_system_content_t, git_system_content_t)
-+ manage_dirs_pattern($1, git_system_content_t, git_system_content_t)
-+ manage_files_pattern($1, git_system_content_t, git_system_content_t)
-+ files_search_var($1)
-+
-+ tunable_policy(`git_system_use_cifs',`
-+ fs_exec_cifs_files($1)
-+ fs_manage_cifs_dirs($1)
-+ fs_manage_cifs_files($1)
-+ ')
-+
-+ tunable_policy(`git_system_use_nfs',`
-+ fs_exec_nfs_files($1)
-+ fs_manage_nfs_dirs($1)
-+ fs_manage_nfs_files($1)
-+ ')
-+')
-+
-+########################################
-+##
-+## Allow the specified domain to read
-+## all Git daemon content files.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+##
-+#
-+interface(`git_read_all_content_files',`
-+ gen_require(`
-+ attribute git_content;
-+ ')
-+
-+ list_dirs_pattern($1, git_content, git_content)
-+ read_files_pattern($1, git_content, git_content)
-+ userdom_search_user_home_dirs($1)
-+ files_search_var_lib($1)
-+
-+ tunable_policy(`use_nfs_home_dirs',`
-+ fs_list_nfs($1)
-+ fs_read_nfs_files($1)
-+ ')
-+
-+ tunable_policy(`use_samba_home_dirs',`
-+ fs_list_cifs($1)
-+ fs_read_cifs_files($1)
-+ ')
-+
-+ tunable_policy(`git_system_use_cifs',`
-+ fs_list_cifs($1)
-+ fs_read_cifs_files($1)
-+ ')
-+
-+ tunable_policy(`git_system_use_nfs',`
-+ fs_list_nfs($1)
-+ fs_read_nfs_files($1)
-+ ')
-+')
-+
-+########################################
-+##
-+## Allow the specified domain to read
-+## Git daemon session content files.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+##
-+#
-+interface(`git_read_session_content_files',`
-+ gen_require(`
-+ type git_session_content_t;
-+ ')
-+
-+ list_dirs_pattern($1, git_session_content_t, git_session_content_t)
-+ read_files_pattern($1, git_session_content_t, git_session_content_t)
-+ userdom_search_user_home_dirs($1)
-+
-+ tunable_policy(`use_nfs_home_dirs',`
-+ fs_list_nfs($1)
-+ fs_read_nfs_files($1)
-+ ')
-+
-+ tunable_policy(`use_samba_home_dirs',`
-+ fs_list_cifs($1)
-+ fs_read_cifs_files($1)
-+ ')
-+')
-+
-+########################################
-+##
-+## Allow the specified domain to read
-+## all Git daemon system content files.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+##
-+#
-+interface(`git_read_all_system_content_files',`
-+ gen_require(`
-+ attribute git_system_content;
-+ ')
-+
-+ list_dirs_pattern($1, git_system_content, git_system_content)
-+ read_files_pattern($1, git_system_content, git_system_content)
-+ files_search_var_lib($1)
-+
-+ tunable_policy(`git_system_use_cifs',`
-+ fs_list_cifs($1)
-+ fs_read_cifs_files($1)
-+ ')
-+
-+ tunable_policy(`git_system_use_nfs',`
-+ fs_list_nfs($1)
-+ fs_read_nfs_files($1)
-+ ')
-+')
-+
-+########################################
-+##
-+## Allow the specified domain to read
-+## Git daemon generic system content files.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+##
-+#
-+interface(`git_read_generic_system_content_files',`
-+ gen_require(`
-+ type git_system_content_t;
-+ ')
-+
-+ list_dirs_pattern($1, git_system_content_t, git_system_content_t)
-+ read_files_pattern($1, git_system_content_t, git_system_content_t)
-+ files_search_var_lib($1)
-+
-+ tunable_policy(`git_system_use_cifs',`
-+ fs_list_cifs($1)
-+ fs_read_cifs_files($1)
-+ ')
-+
-+ tunable_policy(`git_system_use_nfs',`
-+ fs_list_nfs($1)
-+ fs_read_nfs_files($1)
-+ ')
-+')
-+
-+########################################
-+##
-+## Allow the specified domain to relabel
-+## all Git daemon content.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+##
-+#
-+interface(`git_relabel_all_content',`
-+ gen_require(`
-+ attribute git_content;
-+ ')
-+
-+ relabel_dirs_pattern($1, git_content, git_content)
-+ relabel_files_pattern($1, git_content, git_content)
-+ userdom_search_user_home_dirs($1)
-+ files_search_var_lib($1)
-+')
-+
-+########################################
-+##
-+## Allow the specified domain to relabel
-+## all Git daemon system content.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+##
-+#
-+interface(`git_relabel_all_system_content',`
-+ gen_require(`
-+ attribute git_system_content;
-+ ')
-+
-+ relabel_dirs_pattern($1, git_system_content, git_system_content)
-+ relabel_files_pattern($1, git_system_content, git_system_content)
-+ files_search_var_lib($1)
-+')
-+
-+########################################
-+##
-+## Allow the specified domain to relabel
-+## Git daemon generic system content.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+##
-+#
-+interface(`git_relabel_generic_system_content',`
-+ gen_require(`
-+ type git_system_content_t;
-+ ')
-+
-+ relabel_dirs_pattern($1, git_system_content_t, git_system_content_t)
-+ relabel_files_pattern($1, git_system_content_t, git_system_content_t)
-+ files_search_var_lib($1)
-+')
-+
-+########################################
-+##
-+## Allow the specified domain to relabel
-+## Git daemon session content.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+##
-+#
-+interface(`git_relabel_session_content',`
-+ gen_require(`
-+ type git_session_content_t;
-+ ')
-+
-+ relabel_dirs_pattern($1, git_session_content_t, git_session_content_t)
-+ relabel_files_pattern($1, git_session_content_t, git_session_content_t)
-+ userdom_search_user_home_dirs($1)
-+')
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/git.te serefpolicy-3.7.15/policy/modules/services/git.te
---- nsaserefpolicy/policy/modules/services/git.te 2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/git.te 2010-03-18 10:44:43.000000000 -0400
-@@ -1,9 +1,182 @@
-
--policy_module(git, 1.0)
-+policy_module(git, 1.0.3)
-+
-+##
-+##
-+## Allow Git daemon system to search home directories.
-+##
-+##
-+gen_tunable(git_system_enable_homedirs, false)
-+
-+##
-+##
-+## Allow Git daemon system to access cifs file systems.
-+##
-+##
-+gen_tunable(git_system_use_cifs, false)
-+
-+##
-+##
-+## Allow Git daemon system to access nfs file systems.
-+##
-+##
-+gen_tunable(git_system_use_nfs, false)
-+
-+########################################
-+#
-+# Git daemon global private declarations.
-+#
-+
-+attribute git_domains;
-+attribute git_system_content;
-+attribute git_content;
-+
-+type gitd_exec_t;
-+
-+########################################
-+#
-+# Git daemon system private declarations.
-+#
-+
-+type git_system_t, git_domains;
-+inetd_service_domain(git_system_t, gitd_exec_t)
-+role system_r types git_system_t;
-+
-+type git_system_content_t, git_system_content, git_content;
-+files_type(git_system_content_t)
-+typealias git_system_content_t alias git_data_t;
-+
-+########################################
-+#
-+# Git daemon session private declarations.
-+#
-+
-+##
-+##
-+## Allow Git daemon session to bind
-+## tcp sockets to all unreserved ports.
-+##
-+##
-+gen_tunable(git_session_bind_all_unreserved_ports, false)
-+
-+type git_session_t, git_domains;
-+application_domain(git_session_t, gitd_exec_t)
-+ubac_constrained(git_session_t)
-+
-+type git_session_content_t, git_content;
-+userdom_user_home_content(git_session_content_t)
-+
-+########################################
-+#
-+# Git daemon global private policy.
-+#
-+
-+allow git_domains self:fifo_file rw_fifo_file_perms;
-+allow git_domains self:netlink_route_socket create_netlink_socket_perms;
-+allow git_domains self:tcp_socket { create_socket_perms listen };
-+allow git_domains self:udp_socket create_socket_perms;
-+allow git_domains self:unix_dgram_socket create_socket_perms;
-+
-+corenet_all_recvfrom_netlabel(git_domains)
-+corenet_all_recvfrom_unlabeled(git_domains)
-+
-+corenet_tcp_bind_generic_node(git_domains)
-+
-+corenet_tcp_sendrecv_generic_if(git_domains)
-+corenet_tcp_sendrecv_generic_node(git_domains)
-+corenet_tcp_sendrecv_generic_port(git_domains)
-+
-+corenet_tcp_bind_git_port(git_domains)
-+corenet_sendrecv_git_server_packets(git_domains)
-+
-+corecmd_exec_bin(git_domains)
-+
-+files_read_etc_files(git_domains)
-+files_read_usr_files(git_domains)
-+
-+fs_search_auto_mountpoints(git_domains)
-+
-+kernel_read_system_state(git_domains)
-+
-+auth_use_nsswitch(git_domains)
-+
-+logging_send_syslog_msg(git_domains)
-+
-+miscfiles_read_localization(git_domains)
-+
-+########################################
-+#
-+# Git daemon system repository private policy.
-+#
-+
-+list_dirs_pattern(git_system_t, git_content, git_content)
-+read_files_pattern(git_system_t, git_content, git_content)
-+files_search_var(git_system_t)
-+
-+tunable_policy(`git_system_enable_homedirs', `
-+ userdom_search_user_home_dirs(git_system_t)
-+')
-+
-+tunable_policy(`git_system_enable_homedirs && use_nfs_home_dirs', `
-+ fs_list_nfs(git_system_t)
-+ fs_read_nfs_files(git_system_t)
-+')
-+
-+tunable_policy(`git_system_enable_homedirs && use_samba_home_dirs', `
-+ fs_list_cifs(git_system_t)
-+ fs_read_cifs_files(git_system_t)
-+')
-+
-+tunable_policy(`git_system_use_cifs', `
-+ fs_list_cifs(git_system_t)
-+ fs_read_cifs_files(git_system_t)
-+')
-+
-+tunable_policy(`git_system_use_nfs', `
-+ fs_list_nfs(git_system_t)
-+ fs_read_nfs_files(git_system_t)
-+')
-+
-+########################################
-+#
-+# Git daemon session repository private policy.
-+#
-+
-+list_dirs_pattern(git_session_t, git_session_content_t, git_session_content_t)
-+read_files_pattern(git_session_t, git_session_content_t, git_session_content_t)
-+userdom_search_user_home_dirs(git_session_t)
-+
-+userdom_use_user_terminals(git_session_t)
-+
-+tunable_policy(`git_session_bind_all_unreserved_ports', `
-+ corenet_tcp_bind_all_unreserved_ports(git_session_t)
-+')
-+
-+tunable_policy(`use_nfs_home_dirs', `
-+ fs_list_nfs(git_session_t)
-+ fs_read_nfs_files(git_session_t)
-+')
-+
-+tunable_policy(`use_samba_home_dirs', `
-+ fs_list_cifs(git_session_t)
-+ fs_read_cifs_files(git_session_t)
-+')
-+
-+########################################
-+#
-+# cgi git Declarations
-+#
-+
-+optional_policy(`
-+ apache_content_template(git)
-+ git_read_session_content_files(httpd_git_script_t)
-+ files_dontaudit_getattr_tmp_dirs(httpd_git_script_t)
-+')
-
- ########################################
- #
--# Declarations
-+# Git-shell private policy.
- #
-
--apache_content_template(git)
-+#git_role_template(git_shell)
-+#gen_user(git_shell_u, user, git_shell_r, s0, s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gpsd.te serefpolicy-3.7.15/policy/modules/services/gpsd.te
---- nsaserefpolicy/policy/modules/services/gpsd.te 2010-01-07 14:53:53.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/gpsd.te 2010-03-18 10:44:43.000000000 -0400
-@@ -25,7 +25,7 @@
- # gpsd local policy
- #
-
--allow gpsd_t self:capability { fsetid setuid sys_nice setgid fowner };
-+allow gpsd_t self:capability { fowner fsetid setuid setgid sys_nice sys_tty_config };
- allow gpsd_t self:process setsched;
- allow gpsd_t self:shm create_shm_perms;
- allow gpsd_t self:unix_dgram_socket { create_socket_perms sendto };
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-3.7.15/policy/modules/services/hal.te
---- nsaserefpolicy/policy/modules/services/hal.te 2010-02-12 10:33:09.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/hal.te 2010-03-18 10:44:43.000000000 -0400
-@@ -55,6 +55,9 @@
- type hald_var_lib_t;
- files_type(hald_var_lib_t)
-
-+typealias hald_log_t alias pmtools_log_t;
-+typealias hald_var_run_t alias pmtools_var_run_t;
-+
- ########################################
- #
- # Local policy
-@@ -63,7 +66,7 @@
- # execute openvt which needs setuid
- allow hald_t self:capability { chown setuid setgid kill net_admin sys_admin sys_nice dac_override dac_read_search mknod sys_rawio sys_tty_config };
- dontaudit hald_t self:capability {sys_ptrace sys_tty_config };
--allow hald_t self:process { getattr signal_perms };
-+allow hald_t self:process { getsched getattr signal_perms };
- allow hald_t self:fifo_file rw_fifo_file_perms;
- allow hald_t self:unix_stream_socket { create_stream_socket_perms connectto };
- allow hald_t self:unix_dgram_socket create_socket_perms;
-@@ -100,6 +103,7 @@
- kernel_rw_irq_sysctls(hald_t)
- kernel_rw_vm_sysctls(hald_t)
- kernel_write_proc_files(hald_t)
-+kernel_search_network_sysctl(hald_t)
- kernel_setsched(hald_t)
- kernel_request_load_module(hald_t)
-
-@@ -117,6 +121,7 @@
- corenet_udp_sendrecv_all_ports(hald_t)
-
- dev_rw_usbfs(hald_t)
-+dev_read_rand(hald_t)
- dev_read_urand(hald_t)
- dev_read_input(hald_t)
- dev_read_mouse(hald_t)
-@@ -161,6 +166,7 @@
- fs_unmount_dos_fs(hald_t)
- fs_manage_dos_files(hald_t)
- fs_manage_fusefs_dirs(hald_t)
-+fs_rw_removable_blk_files(hald_t)
-
- files_getattr_all_mountpoints(hald_t)
-
-@@ -180,7 +186,7 @@
-
- # hal_probe_serial causes these
- term_setattr_unallocated_ttys(hald_t)
--term_dontaudit_use_unallocated_ttys(hald_t)
-+term_use_unallocated_ttys(hald_t)
-
- auth_use_nsswitch(hald_t)
-
-@@ -266,6 +272,10 @@
- ')
-
- optional_policy(`
-+ gnome_read_config(hald_t)
-+')
-+
-+optional_policy(`
- gpm_dontaudit_getattr_gpmctl(hald_t)
- ')
-
-@@ -295,6 +305,7 @@
- ')
-
- optional_policy(`
-+ ppp_domtrans(hald_t)
- ppp_read_rw_config(hald_t)
- ')
-
-@@ -315,11 +326,19 @@
- ')
-
- optional_policy(`
-+ shutdown_domtrans(hald_t)
-+')
-+
-+optional_policy(`
- udev_domtrans(hald_t)
- udev_read_db(hald_t)
- ')
-
- optional_policy(`
-+ usbmuxd_stream_connect(hald_t)
-+')
-+
-+optional_policy(`
- updfstab_domtrans(hald_t)
- ')
-
-@@ -331,6 +350,10 @@
- virt_manage_images(hald_t)
- ')
-
-+optional_policy(`
-+ xserver_read_pid(hald_t)
-+')
-+
- ########################################
- #
- # Hal acl local policy
-@@ -351,6 +374,7 @@
- manage_dirs_pattern(hald_acl_t, hald_var_run_t, hald_var_run_t)
- manage_files_pattern(hald_acl_t, hald_var_run_t, hald_var_run_t)
- files_pid_filetrans(hald_acl_t, hald_var_run_t, { dir file })
-+allow hald_t hald_var_run_t:dir mounton;
-
- corecmd_exec_bin(hald_acl_t)
-
-@@ -463,6 +487,10 @@
-
- miscfiles_read_localization(hald_keymap_t)
-
-+# This is caused by a bug in hald and PolicyKit.
-+# Should be removed when this is fixed
-+cron_read_system_job_lib_files(hald_t)
-+
- ########################################
- #
- # Local hald dccm policy
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/icecast.fc serefpolicy-3.7.15/policy/modules/services/icecast.fc
---- nsaserefpolicy/policy/modules/services/icecast.fc 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/icecast.fc 2010-03-18 10:44:43.000000000 -0400
-@@ -0,0 +1,7 @@
-+/etc/rc\.d/init\.d/icecast -- gen_context(system_u:object_r:icecast_initrc_exec_t,s0)
-+
-+/usr/bin/icecast -- gen_context(system_u:object_r:icecast_exec_t,s0)
-+
-+/var/log/icecast(/.*)? gen_context(system_u:object_r:icecast_log_t,s0)
-+
-+/var/run/icecast(/.*)? gen_context(system_u:object_r:icecast_var_run_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/icecast.if serefpolicy-3.7.15/policy/modules/services/icecast.if
---- nsaserefpolicy/policy/modules/services/icecast.if 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/icecast.if 2010-03-18 10:44:43.000000000 -0400
-@@ -0,0 +1,199 @@
-+
-+## ShoutCast compatible streaming media server
-+
-+########################################
-+##
-+## Execute a domain transition to run icecast.
-+##
-+##
-+##
-+## Domain allowed to transition.
-+##
-+##
-+#
-+interface(`icecast_domtrans',`
-+ gen_require(`
-+ type icecast_t, icecast_exec_t;
-+ ')
-+
-+ domtrans_pattern($1, icecast_exec_t, icecast_t)
-+')
-+
-+
-+########################################
-+##
-+## Execute icecast server in the icecast domain.
-+##
-+##
-+##
-+## The type of the process performing this action.
-+##
-+##
-+#
-+interface(`icecast_initrc_domtrans',`
-+ gen_require(`
-+ type icecast_initrc_exec_t;
-+ ')
-+
-+ init_labeled_script_domtrans($1, icecast_initrc_exec_t)
-+')
-+
-+########################################
-+##
-+## Read icecast PID files.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`icecast_read_pid_files',`
-+ gen_require(`
-+ type icecast_var_run_t;
-+ ')
-+
-+ files_search_pids($1)
-+ allow $1 icecast_var_run_t:file read_file_perms;
-+')
-+
-+########################################
-+##
-+## Manage icecast var_run files.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`icecast_manage_var_run',`
-+ gen_require(`
-+ type icecast_var_run_t;
-+ ')
-+
-+ manage_dirs_pattern($1, icecast_var_run_t, icecast_var_run_t)
-+ manage_files_pattern($1, icecast_var_run_t, icecast_var_run_t)
-+ manage_lnk_files_pattern($1, icecast_var_run_t, icecast_var_run_t)
-+')
-+
-+
-+########################################
-+##
-+## Allow the specified domain to read icecast's log files.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+##
-+#
-+interface(`icecast_read_log',`
-+ gen_require(`
-+ type icecast_log_t;
-+ ')
-+
-+ logging_search_logs($1)
-+ read_files_pattern($1, icecast_log_t, icecast_log_t)
-+')
-+
-+########################################
-+##
-+## Allow the specified domain to append
-+## icecast log files.
-+##
-+##
-+##
-+## Domain allowed to transition.
-+##
-+##
-+#
-+interface(`icecast_append_log',`
-+ gen_require(`
-+ type var_log_t, icecast_log_t;
-+ ')
-+
-+ logging_search_logs($1)
-+ append_files_pattern($1, icecast_log_t, icecast_log_t)
-+')
-+
-+########################################
-+##
-+## Allow domain to manage icecast log files
-+##
-+##
-+##
-+## Domain to not audit.
-+##
-+##
-+#
-+interface(`icecast_manage_log',`
-+ gen_require(`
-+ type icecast_log_t;
-+ ')
-+
-+ manage_dirs_pattern($1, icecast_log_t, icecast_log_t)
-+ manage_files_pattern($1, icecast_log_t, icecast_log_t)
-+ manage_lnk_files_pattern($1, icecast_log_t, icecast_log_t)
-+')
-+
-+########################################
-+##
-+## Allow domain signal icecast
-+##
-+##
-+##
-+## Domain to not audit.
-+##
-+##
-+#
-+interface(`icecast_signal',`
-+ gen_require(`
-+ type icecast_t;
-+ ')
-+
-+ allow $1 icecast_t:process signal;
-+')
-+
-+########################################
-+##
-+## All of the rules required to administrate
-+## an icecast environment
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+##
-+##
-+## Role allowed access.
-+##
-+##
-+##
-+#
-+interface(`icecast_admin',`
-+ gen_require(`
-+ type icecast_t;
-+ ')
-+
-+ allow $1 icecast_t:process { ptrace signal_perms getattr };
-+ read_files_pattern($1, icecast_t, icecast_t)
-+
-+
-+ gen_require(`
-+ type icecast_initrc_exec_t;
-+ ')
-+
-+ # Allow icecast_t to restart the apache service
-+ icecast_initrc_domtrans($1)
-+ domain_system_change_exemption($1)
-+ role_transition $2 icecast_initrc_exec_t system_r;
-+ allow $2 system_r;
-+
-+ icecast_manage_var_run($1)
-+
-+ icecast_manage_log($1)
-+
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/icecast.te serefpolicy-3.7.15/policy/modules/services/icecast.te
---- nsaserefpolicy/policy/modules/services/icecast.te 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/icecast.te 2010-03-18 10:44:43.000000000 -0400
-@@ -0,0 +1,59 @@
-+policy_module(icecast,1.0.0)
-+
-+########################################
-+#
-+# Declarations
-+#
-+
-+type icecast_t;
-+type icecast_exec_t;
-+init_daemon_domain(icecast_t, icecast_exec_t)
-+
-+permissive icecast_t;
-+
-+type icecast_initrc_exec_t;
-+init_script_file(icecast_initrc_exec_t)
-+
-+type icecast_var_run_t;
-+files_pid_file(icecast_var_run_t)
-+
-+type icecast_log_t;
-+logging_log_file(icecast_log_t)
-+
-+########################################
-+#
-+# icecast local policy
-+#
-+
-+allow icecast_t self:capability { dac_override setgid setuid sys_nice };
-+allow icecast_t self:process { getsched fork setsched signal };
-+
-+# Init script handling
-+domain_use_interactive_fds(icecast_t)
-+
-+# internal communication is often done using fifo and unix sockets.
-+allow icecast_t self:fifo_file rw_fifo_file_perms;
-+allow icecast_t self:unix_stream_socket create_stream_socket_perms;
-+allow icecast_t self:tcp_socket create_stream_socket_perms;
-+
-+corenet_tcp_bind_soundd_port(icecast_t)
-+
-+files_read_etc_files(icecast_t)
-+
-+miscfiles_read_localization(icecast_t)
-+
-+manage_dirs_pattern(icecast_t, icecast_var_run_t, icecast_var_run_t)
-+manage_files_pattern(icecast_t, icecast_var_run_t, icecast_var_run_t)
-+files_pid_filetrans(icecast_t, icecast_var_run_t, { file dir })
-+
-+manage_dirs_pattern(icecast_t, icecast_log_t, icecast_log_t)
-+manage_files_pattern(icecast_t, icecast_log_t, icecast_log_t)
-+logging_log_filetrans(icecast_t, icecast_log_t, { file dir } )
-+
-+auth_use_nsswitch(icecast_t)
-+
-+sysnet_dns_name_resolve(icecast_t)
-+
-+optional_policy(`
-+ rtkit_daemon_system_domain(icecast_t)
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inn.te serefpolicy-3.7.15/policy/modules/services/inn.te
---- nsaserefpolicy/policy/modules/services/inn.te 2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/inn.te 2010-03-18 10:44:43.000000000 -0400
-@@ -106,6 +106,7 @@
-
- userdom_dontaudit_use_unpriv_user_fds(innd_t)
- userdom_dontaudit_search_user_home_dirs(innd_t)
-+userdom_stream_connect(innd_t)
-
- mta_send_mail(innd_t)
-
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.if serefpolicy-3.7.15/policy/modules/services/kerberos.if
---- nsaserefpolicy/policy/modules/services/kerberos.if 2010-03-18 06:48:09.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/kerberos.if 2010-03-18 10:44:43.000000000 -0400
-@@ -74,7 +74,7 @@
- ')
-
- files_search_etc($1)
-- allow $1 krb5_conf_t:file read_file_perms;
-+ read_files_pattern($1, krb5_conf_t, krb5_conf_t)
- dontaudit $1 krb5_conf_t:file write;
- dontaudit $1 krb5kdc_conf_t:dir list_dir_perms;
- dontaudit $1 krb5kdc_conf_t:file rw_file_perms;
-@@ -84,6 +84,10 @@
- selinux_dontaudit_validate_context($1)
- seutil_dontaudit_read_file_contexts($1)
-
-+ optional_policy(`
-+ sssd_read_public_files($1)
-+ ')
-+
- tunable_policy(`allow_kerberos',`
- allow $1 self:tcp_socket create_socket_perms;
- allow $1 self:udp_socket create_socket_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.te serefpolicy-3.7.15/policy/modules/services/kerberos.te
---- nsaserefpolicy/policy/modules/services/kerberos.te 2010-03-18 06:48:09.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/kerberos.te 2010-03-18 10:44:43.000000000 -0400
-@@ -112,6 +112,7 @@
-
- kernel_read_kernel_sysctls(kadmind_t)
- kernel_list_proc(kadmind_t)
-+kernel_read_network_state(kadmind_t)
- kernel_read_proc_symlinks(kadmind_t)
- kernel_read_system_state(kadmind_t)
-
-@@ -283,7 +284,7 @@
- allow kpropd_t self:unix_stream_socket create_stream_socket_perms;
- allow kpropd_t self:tcp_socket create_stream_socket_perms;
-
--allow kpropd_t krb5_host_rcache_t:file rw_file_perms;
-+allow kpropd_t krb5_host_rcache_t:file manage_file_perms;
-
- allow kpropd_t krb5_keytab_t:file read_file_perms;
-
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ksmtuned.fc serefpolicy-3.7.15/policy/modules/services/ksmtuned.fc
---- nsaserefpolicy/policy/modules/services/ksmtuned.fc 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/ksmtuned.fc 2010-03-18 10:44:43.000000000 -0400
-@@ -0,0 +1,5 @@
-+/etc/rc\.d/init\.d/ksmtuned -- gen_context(system_u:object_r:ksmtuned_initrc_exec_t,s0)
-+
-+/usr/sbin/ksmtuned -- gen_context(system_u:object_r:ksmtuned_exec_t,s0)
-+
-+/var/run/ksmtune\.pid -- gen_context(system_u:object_r:ksmtuned_var_run_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ksmtuned.if serefpolicy-3.7.15/policy/modules/services/ksmtuned.if
---- nsaserefpolicy/policy/modules/services/ksmtuned.if 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/ksmtuned.if 2010-03-18 10:44:43.000000000 -0400
-@@ -0,0 +1,76 @@
-+
-+## policy for Kernel Samepage Merging (KSM) Tuning Daemon
-+
-+########################################
-+##
-+## Execute a domain transition to run ksmtuned.
-+##
-+##
-+##
-+## Domain allowed to transition.
-+##
-+##
-+#
-+interface(`ksmtuned_domtrans',`
-+ gen_require(`
-+ type ksmtuned_t, ksmtuned_exec_t;
-+ ')
-+
-+ domtrans_pattern($1, ksmtuned_exec_t, ksmtuned_t)
-+')
-+
-+
-+########################################
-+##
-+## Execute ksmtuned server in the ksmtuned domain.
-+##
-+##
-+##
-+## The type of the process performing this action.
-+##
-+##
-+#
-+interface(`ksmtuned_initrc_domtrans',`
-+ gen_require(`
-+ type ksmtuned_initrc_exec_t;
-+ ')
-+
-+ init_labeled_script_domtrans($1, ksmtuned_initrc_exec_t)
-+')
-+
-+########################################
-+##
-+## All of the rules required to administrate
-+## an ksmtuned environment
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+##
-+##
-+## Role allowed access.
-+##
-+##
-+##
-+#
-+interface(`ksmtuned_admin',`
-+ gen_require(`
-+ type ksmtuned_t, ksmtuned_var_run_t;
-+ type ksmtuned_initrc_exec_t;
-+ ')
-+
-+ allow $1 ksmtuned_t:process { ptrace signal_perms getattr };
-+ read_files_pattern($1, ksmtuned_t, ksmtuned_t)
-+
-+ files_list_pids($1)
-+ admin_pattern($1, ksmtuned_var_run_t)
-+
-+ # Allow ksmtuned_t to restart the apache service
-+ ksmtuned_initrc_domtrans($1)
-+ domain_system_change_exemption($1)
-+ role_transition $2 ksmtuned_initrc_exec_t system_r;
-+ allow $2 system_r;
-+
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ksmtuned.te serefpolicy-3.7.15/policy/modules/services/ksmtuned.te
---- nsaserefpolicy/policy/modules/services/ksmtuned.te 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/ksmtuned.te 2010-03-18 10:44:43.000000000 -0400
-@@ -0,0 +1,44 @@
-+policy_module(ksmtuned,1.0.0)
-+
-+########################################
-+#
-+# Declarations
-+#
-+
-+type ksmtuned_t;
-+type ksmtuned_exec_t;
-+init_daemon_domain(ksmtuned_t, ksmtuned_exec_t)
-+
-+type ksmtuned_initrc_exec_t;
-+init_script_file(ksmtuned_initrc_exec_t)
-+
-+type ksmtuned_var_run_t;
-+files_pid_file(ksmtuned_var_run_t)
-+
-+########################################
-+#
-+# ksmtuned local policy
-+#
-+allow ksmtuned_t self:capability { sys_ptrace sys_tty_config };
-+
-+# Init script handling
-+domain_use_interactive_fds(ksmtuned_t)
-+
-+# internal communication is often done using fifo and unix sockets.
-+allow ksmtuned_t self:fifo_file rw_file_perms;
-+allow ksmtuned_t self:unix_stream_socket create_stream_socket_perms;
-+
-+manage_files_pattern(ksmtuned_t, ksmtuned_var_run_t, ksmtuned_var_run_t)
-+files_pid_filetrans(ksmtuned_t, ksmtuned_var_run_t, file)
-+
-+kernel_read_system_state(ksmtuned_t)
-+
-+dev_rw_sysfs(ksmtuned_t)
-+
-+domain_read_all_domains_state(ksmtuned_t)
-+
-+corecmd_exec_bin(ksmtuned_t)
-+
-+files_read_etc_files(ksmtuned_t)
-+
-+miscfiles_read_localization(ksmtuned_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.fc serefpolicy-3.7.15/policy/modules/services/ldap.fc
---- nsaserefpolicy/policy/modules/services/ldap.fc 2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/ldap.fc 2010-03-18 10:44:43.000000000 -0400
-@@ -1,5 +1,7 @@
-
- /etc/ldap/slapd\.conf -- gen_context(system_u:object_r:slapd_etc_t,s0)
-+/etc/openldap/slapd\.d(/.*)? gen_context(system_u:object_r:slapd_db_t,s0)
-+
- /etc/rc\.d/init\.d/ldap -- gen_context(system_u:object_r:slapd_initrc_exec_t,s0)
-
- /usr/sbin/slapd -- gen_context(system_u:object_r:slapd_exec_t,s0)
-@@ -15,3 +17,4 @@
- /var/run/openldap(/.*)? gen_context(system_u:object_r:slapd_var_run_t,s0)
- /var/run/slapd\.args -- gen_context(system_u:object_r:slapd_var_run_t,s0)
- /var/run/slapd\.pid -- gen_context(system_u:object_r:slapd_var_run_t,s0)
-+#/var/run/slapd.* -s gen_context(system_u:object_r:slapd_var_run_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.if serefpolicy-3.7.15/policy/modules/services/ldap.if
---- nsaserefpolicy/policy/modules/services/ldap.if 2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/ldap.if 2010-03-18 10:44:43.000000000 -0400
-@@ -1,5 +1,43 @@
- ## OpenLDAP directory server
-
-+#######################################
-+##
-+## Execute OpenLDAP in the ldap domain.
-+##
-+##
-+##
-+## The type of the process performing this action.
-+##
-+##
-+#
-+interface(`ldap_domtrans',`
-+ gen_require(`
-+ type slapd_t, slapd_exec_t;
-+ ')
-+
-+ domtrans_pattern($1, slapd_exec_t, slapd_t)
-+
-+')
-+
-+#######################################
-+##
-+## Execute OpenLDAP server in the ldap domain.
-+##
-+##
-+##
-+## The type of the process performing this action.
-+##
-+##
-+#
-+interface(`ldap_initrc_domtrans',`
-+ gen_require(`
-+ type slapd_initrc_exec_t;
-+ ')
-+
-+ init_labeled_script_domtrans($1, slapd_initrc_exec_t)
-+')
-+
-+
- ########################################
- ##
- ## Read the contents of the OpenLDAP
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.te serefpolicy-3.7.15/policy/modules/services/ldap.te
---- nsaserefpolicy/policy/modules/services/ldap.te 2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/ldap.te 2010-03-18 10:44:43.000000000 -0400
-@@ -28,9 +28,15 @@
- type slapd_replog_t;
- files_type(slapd_replog_t)
-
-+type slapd_log_t;
-+logging_log_file(slapd_log_t)
-+
- type slapd_tmp_t;
- files_tmp_file(slapd_tmp_t)
-
-+type slapd_tmpfs_t;
-+files_tmpfs_file(slapd_tmpfs_t)
-+
- type slapd_var_run_t;
- files_pid_file(slapd_var_run_t)
-
-@@ -68,10 +74,17 @@
- manage_files_pattern(slapd_t, slapd_replog_t, slapd_replog_t)
- manage_lnk_files_pattern(slapd_t, slapd_replog_t, slapd_replog_t)
-
-+manage_dirs_pattern(slapd_t, slapd_log_t, slapd_log_t)
-+manage_files_pattern(slapd_t, slapd_log_t, slapd_log_t)
-+logging_log_filetrans(slapd_t, slapd_log_t, { file dir })
-+
- manage_dirs_pattern(slapd_t, slapd_tmp_t, slapd_tmp_t)
- manage_files_pattern(slapd_t, slapd_tmp_t, slapd_tmp_t)
- files_tmp_filetrans(slapd_t, slapd_tmp_t, { file dir })
-
-+manage_files_pattern(slapd_t, slapd_tmpfs_t, slapd_tmpfs_t)
-+fs_tmpfs_filetrans(slapd_t, slapd_tmpfs_t,file)
-+
- manage_files_pattern(slapd_t, slapd_var_run_t, slapd_var_run_t)
- manage_sock_files_pattern(slapd_t, slapd_var_run_t, slapd_var_run_t)
- files_pid_filetrans(slapd_t, slapd_var_run_t, { file sock_file })
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lircd.te serefpolicy-3.7.15/policy/modules/services/lircd.te
---- nsaserefpolicy/policy/modules/services/lircd.te 2010-01-11 09:40:36.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/lircd.te 2010-03-18 10:44:43.000000000 -0400
-@@ -24,8 +24,11 @@
- # lircd local policy
- #
-
--allow lircd_t self:process signal;
-+allow lircd_t self:capability { chown kill sys_admin };
-+allow lircd_t self:process { fork signal };
- allow lircd_t self:unix_dgram_socket create_socket_perms;
-+allow lircd_t self:fifo_file rw_fifo_file_perms;
-+allow lircd_t self:tcp_socket create_stream_socket_perms;
-
- # etc file
- read_files_pattern(lircd_t, lircd_etc_t, lircd_etc_t)
-@@ -34,21 +37,31 @@
- manage_files_pattern(lircd_t, lircd_var_run_t, lircd_var_run_t)
- manage_sock_files_pattern(lircd_t, lircd_var_run_t, lircd_var_run_t)
- files_pid_filetrans(lircd_t, lircd_var_run_t, { dir file })
--# /dev/lircd socket
--dev_filetrans(lircd_t, lircd_var_run_t, sock_file)
-
-+corenet_tcp_bind_generic_node(lircd_t)
-+corenet_tcp_bind_lirc_port(lircd_t)
-+corenet_tcp_connect_lirc_port(lircd_t)
-+corenet_tcp_sendrecv_all_ports(lircd_t)
-+corenet_tcp_sendrecv_generic_if(lircd_t)
-+
-+# /dev/lircd socket
-+dev_filetrans(lircd_t, lircd_var_run_t, sock_file )
- dev_read_generic_usb_dev(lircd_t)
-+dev_read_mouse(lircd_t)
- dev_filetrans_lirc(lircd_t)
- dev_rw_lirc(lircd_t)
- dev_rw_input_dev(lircd_t)
-
--files_read_etc_files(lircd_t)
- files_list_var(lircd_t)
- files_manage_generic_locks(lircd_t)
- files_read_all_locks(lircd_t)
-+files_read_etc_files(lircd_t)
-
- term_use_ptmx(lircd_t)
-
- logging_send_syslog_msg(lircd_t)
-
- miscfiles_read_localization(lircd_t)
-+
-+sysnet_dns_name_resolve(lircd_t)
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/memcached.te serefpolicy-3.7.15/policy/modules/services/memcached.te
---- nsaserefpolicy/policy/modules/services/memcached.te 2009-12-18 11:38:25.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/memcached.te 2010-03-18 10:44:43.000000000 -0400
-@@ -22,9 +22,12 @@
- #
-
- allow memcached_t self:capability { setuid setgid };
-+dontaudit memcached_t self:capability sys_tty_config;
-+allow memcached_t self:process { fork setrlimit signal_perms };
- allow memcached_t self:tcp_socket create_stream_socket_perms;
- allow memcached_t self:udp_socket { create_socket_perms listen };
- allow memcached_t self:fifo_file rw_fifo_file_perms;
-+allow memcached_t self:unix_stream_socket create_stream_socket_perms;
-
- corenet_all_recvfrom_unlabeled(memcached_t)
- corenet_udp_sendrecv_generic_if(memcached_t)
-@@ -42,10 +45,15 @@
- manage_files_pattern(memcached_t, memcached_var_run_t, memcached_var_run_t)
- files_pid_filetrans(memcached_t, memcached_var_run_t, { file dir })
-
-+kernel_read_kernel_sysctls(memcached_t)
- kernel_read_system_state(memcached_t)
-
- files_read_etc_files(memcached_t)
-
-+auth_use_nsswitch(memcached_t)
-+
- miscfiles_read_localization(memcached_t)
-
--sysnet_dns_name_resolve(memcached_t)
-+term_dontaudit_use_all_ptys(memcached_t)
-+term_dontaudit_use_all_ttys(memcached_t)
-+term_dontaudit_use_console(memcached_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/modemmanager.te serefpolicy-3.7.15/policy/modules/services/modemmanager.te
---- nsaserefpolicy/policy/modules/services/modemmanager.te 2009-12-18 11:38:25.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/modemmanager.te 2010-03-18 10:44:43.000000000 -0400
-@@ -16,8 +16,8 @@
- #
- # ModemManager local policy
- #
--
--allow modemmanager_t self:process signal;
-+allow modemmanager_t self:capability { net_admin sys_admin sys_tty_config };
-+allow modemmanager_t self:process { getsched signal };
- allow modemmanager_t self:fifo_file rw_file_perms;
- allow modemmanager_t self:unix_stream_socket create_stream_socket_perms;
- allow modemmanager_t self:netlink_kobject_uevent_socket create_socket_perms;
-@@ -29,6 +29,7 @@
-
- files_read_etc_files(modemmanager_t)
-
-+term_use_generic_ptys(modemmanager_t)
- term_use_unallocated_ttys(modemmanager_t)
-
- miscfiles_read_localization(modemmanager_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.fc serefpolicy-3.7.15/policy/modules/services/mta.fc
---- nsaserefpolicy/policy/modules/services/mta.fc 2010-01-07 14:53:53.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/mta.fc 2010-03-18 10:44:43.000000000 -0400
-@@ -13,6 +13,8 @@
-
- /usr/bin/esmtp -- gen_context(system_u:object_r:sendmail_exec_t,s0)
-
-+/root/\.forward -- gen_context(system_u:object_r:mail_forward_t,s0)
-+
- /usr/lib(64)?/sendmail -- gen_context(system_u:object_r:sendmail_exec_t,s0)
- /usr/lib/courier/bin/sendmail -- gen_context(system_u:object_r:sendmail_exec_t,s0)
-
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.if serefpolicy-3.7.15/policy/modules/services/mta.if
---- nsaserefpolicy/policy/modules/services/mta.if 2010-01-07 14:53:53.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/mta.if 2010-03-18 10:44:43.000000000 -0400
-@@ -220,6 +220,25 @@
- application_executable_file($1)
- ')
-
-+######################################
-+##
-+## Dontaudit read and write an leaked file descriptors
-+##
-+##
-+##
-+## The type of the process performing this action.
-+##
-+##
-+#
-+interface(`mta_dontaudit_leaks_system_mail',`
-+ gen_require(`
-+ type system_mail_t;
-+ ')
-+
-+ dontaudit $1 system_mail_t:fifo_file write;
-+ dontaudit $1 system_mail_t:tcp_socket { read write };
-+')
-+
- ########################################
- ##
- ## Make the specified type by a system MTA.
-@@ -335,6 +354,7 @@
- # apache should set close-on-exec
- apache_dontaudit_rw_stream_sockets($1)
- apache_dontaudit_rw_sys_script_stream_sockets($1)
-+ apache_append_log($1)
- ')
- ')
-
-@@ -356,11 +376,35 @@
- ')
-
- allow $1 mta_exec_type:lnk_file read_lnk_file_perms;
-+ corecmd_read_bin_symlinks($1)
- domtrans_pattern($1, mta_exec_type, system_mail_t)
-
- allow mta_user_agent $1:fd use;
- allow mta_user_agent $1:process sigchld;
- allow mta_user_agent $1:fifo_file rw_fifo_file_perms;
-+
-+ ifdef(`hide_broken_symptoms', `
-+ dontaudit system_mail_t $1:socket_class_set { read write };
-+ ')
-+')
-+
-+########################################
-+##
-+## Send mail client a signal
-+##
-+##
-+##
-+## The type of the process performing this action.
-+##
-+##
-+#
-+#
-+interface(`mta_signal',`
-+ gen_require(`
-+ type system_mail_t;
-+ ')
-+
-+ allow $1 system_mail_t:process signal;
- ')
-
- ########################################
-@@ -454,7 +498,8 @@
- type etc_mail_t;
- ')
-
-- write_files_pattern($1, etc_mail_t, etc_mail_t)
-+ manage_files_pattern($1, etc_mail_t, etc_mail_t)
-+ allow $1 etc_mail_t:file setattr;
- ')
-
- ########################################
-@@ -678,7 +723,7 @@
- files_search_spool($1)
- allow $1 mail_spool_t:dir list_dir_perms;
- allow $1 mail_spool_t:file setattr;
-- rw_files_pattern($1, mail_spool_t, mail_spool_t)
-+ manage_files_pattern($1, mail_spool_t, mail_spool_t)
- read_lnk_files_pattern($1, mail_spool_t, mail_spool_t)
- ')
-
-@@ -765,6 +810,25 @@
-
- #######################################
- ##
-+## List the mail queue.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`mta_list_queue',`
-+ gen_require(`
-+ type mqueue_spool_t;
-+ ')
-+
-+ allow $1 mqueue_spool_t:dir list_dir_perms;
-+ files_search_spool($1)
-+')
-+
-+#######################################
-+##
- ## Read the mail queue.
- ##
- ##
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-3.7.15/policy/modules/services/mta.te
---- nsaserefpolicy/policy/modules/services/mta.te 2010-01-07 14:53:53.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/mta.te 2010-03-18 10:44:43.000000000 -0400
-@@ -63,6 +63,9 @@
-
- can_exec(system_mail_t, mta_exec_type)
-
-+files_read_all_tmp_files(system_mail_t)
-+files_read_usr_files(system_mail_t)
-+
- kernel_read_system_state(system_mail_t)
- kernel_read_network_state(system_mail_t)
- kernel_request_load_module(system_mail_t)
-@@ -75,20 +78,27 @@
-
- selinux_getattr_fs(system_mail_t)
-
-+term_dontaudit_use_unallocated_ttys(system_mail_t)
-+
- init_use_script_ptys(system_mail_t)
-
- userdom_use_user_terminals(system_mail_t)
- userdom_dontaudit_search_user_home_dirs(system_mail_t)
-+userdom_dontaudit_list_admin_dir(system_mail_t)
-+
-+logging_append_all_logs(system_mail_t)
-
- optional_policy(`
- apache_read_squirrelmail_data(system_mail_t)
- apache_append_squirrelmail_data(system_mail_t)
-+ apache_search_bugzilla_dirs(system_mail_t)
-
- # apache should set close-on-exec
- apache_dontaudit_append_log(system_mail_t)
- apache_dontaudit_rw_stream_sockets(system_mail_t)
- apache_dontaudit_rw_tcp_sockets(system_mail_t)
- apache_dontaudit_rw_sys_script_stream_sockets(system_mail_t)
-+ apache_dontaudit_rw_bugzilla_script_stream_sockets(system_mail_t)
- ')
-
- optional_policy(`
-@@ -107,6 +117,7 @@
- optional_policy(`
- cron_read_system_job_tmp_files(system_mail_t)
- cron_dontaudit_write_pipes(system_mail_t)
-+ cron_rw_system_job_stream_sockets(system_mail_t)
- ')
-
- optional_policy(`
-@@ -126,6 +137,7 @@
-
- optional_policy(`
- fail2ban_append_log(system_mail_t)
-+ fail2ban_dontaudit_leaks(system_mail_t)
- ')
-
- optional_policy(`
-@@ -142,6 +154,10 @@
- ')
-
- optional_policy(`
-+ munin_dontaudit_leaks(system_mail_t)
-+')
-+
-+optional_policy(`
- nagios_read_tmp_files(system_mail_t)
- ')
-
-@@ -185,6 +201,10 @@
- ')
-
- optional_policy(`
-+ spamd_stream_connect(system_mail_t)
-+')
-+
-+optional_policy(`
- smartmon_read_tmp_files(system_mail_t)
- ')
-
-@@ -216,6 +236,7 @@
- create_lnk_files_pattern(mailserver_delivery, mail_spool_t, mail_spool_t)
- read_lnk_files_pattern(mailserver_delivery, mail_spool_t, mail_spool_t)
-
-+userdom_search_admin_dir(mailserver_delivery)
- read_files_pattern(mailserver_delivery, mail_forward_t, mail_forward_t)
-
- read_files_pattern(mailserver_delivery, system_mail_tmp_t, system_mail_tmp_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/munin.fc serefpolicy-3.7.15/policy/modules/services/munin.fc
---- nsaserefpolicy/policy/modules/services/munin.fc 2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/munin.fc 2010-03-18 10:44:43.000000000 -0400
-@@ -6,6 +6,64 @@
- /usr/share/munin/munin-.* -- gen_context(system_u:object_r:munin_exec_t,s0)
- /usr/share/munin/plugins/.* -- gen_context(system_u:object_r:munin_exec_t,s0)
-
-+# disk plugins
-+/usr/share/munin/plugins/diskstat.* -- gen_context(system_u:object_r:munin_disk_plugin_exec_t,s0)
-+/usr/share/munin/plugins/df.* -- gen_context(system_u:object_r:munin_disk_plugin_exec_t,s0)
-+/usr/share/munin/plugins/hddtemp.* -- gen_context(system_u:object_r:munin_disk_plugin_exec_t,s0)
-+/usr/share/munin/plugins/smart_.* -- gen_context(system_u:object_r:munin_disk_plugin_exec_t,s0)
-+
-+# mail plugins
-+/usr/share/munin/plugins/courier_mta_.* -- gen_context(system_u:object_r:munin_mail_plugin_exec_t,s0)
-+/usr/share/munin/plugins/exim_mail.* -- gen_context(system_u:object_r:munin_mail_plugin_exec_t,s0)
-+/usr/share/munin/plugins/mailman -- gen_context(system_u:object_r:munin_mail_plugin_exec_t,s0)
-+/usr/share/munin/plugins/mailscanner -- gen_context(system_u:object_r:munin_mail_plugin_exec_t,s0)
-+/usr/share/munin/plugins/postfix_mail.* -- gen_context(system_u:object_r:munin_mail_plugin_exec_t,s0)
-+/usr/share/munin/plugins/sendmail_.* -- gen_context(system_u:object_r:munin_mail_plugin_exec_t,s0)
-+/usr/share/munin/plugins/qmail.* -- gen_context(system_u:object_r:munin_mail_plugin_exec_t,s0)
-+
-+# services plugins
-+/usr/share/munin/plugins/apache_.* -- gen_context(system_u:object_r:munin_services_plugin_exec_t,s0)
-+/usr/share/munin/plugins/asterisk_.* -- gen_context(system_u:object_r:munin_services_plugin_exec_t,s0)
-+/usr/share/munin/plugins/http_loadtime -- gen_context(system_u:object_r:munin_services_plugin_exec_t,s0)
-+/usr/share/munin/plugins/fail2ban -- gen_context(system_u:object_r:munin_services_plugin_exec_t,s0)
-+/usr/share/munin/plugins/lpstat -- gen_context(system_u:object_r:munin_services_plugin_exec_t,s0)
-+/usr/share/munin/plugins/mysql_.* -- gen_context(system_u:object_r:munin_services_plugin_exec_t,s0)
-+/usr/share/munin/plugins/named -- gen_context(system_u:object_r:munin_services_plugin_exec_t,s0)
-+/usr/share/munin/plugins/ntp_.* -- gen_context(system_u:object_r:munin_services_plugin_exec_t,s0)
-+/usr/share/munin/plugins/nut.* -- gen_context(system_u:object_r:munin_services_plugin_exec_t,s0)
-+/usr/share/munin/plugins/openvpn -- gen_context(system_u:object_r:munin_services_plugin_exec_t,s0)
-+/usr/share/munin/plugins/ping_ -- gen_context(system_u:object_r:munin_services_plugin_exec_t,s0)
-+/usr/share/munin/plugins/postgres_.* -- gen_context(system_u:object_r:munin_services_plugin_exec_t,s0)
-+/usr/share/munin/plugins/samba -- gen_context(system_u:object_r:munin_services_plugin_exec_t,s0)
-+/usr/share/munin/plugins/slapd_.* -- gen_context(system_u:object_r:munin_services_plugin_exec_t,s0)
-+/usr/share/munin/plugins/snmp_.* -- gen_context(system_u:object_r:munin_services_plugin_exec_t,s0)
-+/usr/share/munin/plugins/squid_.* -- gen_context(system_u:object_r:munin_services_plugin_exec_t,s0)
-+/usr/share/munin/plugins/tomcat_.* -- gen_context(system_u:object_r:munin_services_plugin_exec_t,s0)
-+/usr/share/munin/plugins/varnish_.* -- gen_context(system_u:object_r:munin_services_plugin_exec_t,s0)
-+
-+# system plugins
-+/usr/share/munin/plugins/acpi -- gen_context(system_u:object_r:munin_system_plugin_exec_t,s0)
-+/usr/share/munin/plugins/cpu.* -- gen_context(system_u:object_r:munin_system_plugin_exec_t,s0)
-+/usr/share/munin/plugins/forks -- gen_context(system_u:object_r:munin_system_plugin_exec_t,s0)
-+/usr/share/munin/plugins/if_.* -- gen_context(system_u:object_r:munin_system_plugin_exec_t,s0)
-+/usr/share/munin/plugins/iostat.* -- gen_context(system_u:object_r:munin_system_plugin_exec_t,s0)
-+/usr/share/munin/plugins/interrupts -- gen_context(system_u:object_r:munin_system_plugin_exec_t,s0)
-+/usr/share/munin/plugins/irqstats -- gen_context(system_u:object_r:munin_system_plugin_exec_t,s0)
-+/usr/share/munin/plugins/load -- gen_context(system_u:object_r:munin_system_plugin_exec_t,s0)
-+/usr/share/munin/plugins/memory -- gen_context(system_u:object_r:munin_system_plugin_exec_t,s0)
-+/usr/share/munin/plugins/netstat -- gen_context(system_u:object_r:munin_system_plugin_exec_t,s0)
-+/usr/share/munin/plugins/nfs.* -- gen_context(system_u:object_r:munin_system_plugin_exec_t,s0)
-+/usr/share/munin/plugins/open_files -- gen_context(system_u:object_r:munin_system_plugin_exec_t,s0)
-+/usr/share/munin/plugins/proc_pri -- gen_context(system_u:object_r:munin_system_plugin_exec_t,s0)
-+/usr/share/munin/plugins/processes -- gen_context(system_u:object_r:munin_system_plugin_exec_t,s0)
-+/usr/share/munin/plugins/swap -- gen_context(system_u:object_r:munin_system_plugin_exec_t,s0)
-+/usr/share/munin/plugins/threads -- gen_context(system_u:object_r:munin_system_plugin_exec_t,s0)
-+/usr/share/munin/plugins/uptime -- gen_context(system_u:object_r:munin_system_plugin_exec_t,s0)
-+/usr/share/munin/plugins/users -- gen_context(system_u:object_r:munin_system_plugin_exec_t,s0)
-+/usr/share/munin/plugins/yum -- gen_context(system_u:object_r:munin_system_plugin_exec_t,s0)
-+
- /var/lib/munin(/.*)? gen_context(system_u:object_r:munin_var_lib_t,s0)
- /var/log/munin.* gen_context(system_u:object_r:munin_log_t,s0)
- /var/run/munin(/.*)? gen_context(system_u:object_r:munin_var_run_t,s0)
-+/var/www/html/munin(/.*)? gen_context(system_u:object_r:httpd_munin_content_t,s0)
-+/var/www/html/munin/cgi(/.*)? gen_context(system_u:object_r:httpd_munin_script_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/munin.if serefpolicy-3.7.15/policy/modules/services/munin.if
---- nsaserefpolicy/policy/modules/services/munin.if 2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/munin.if 2010-03-18 10:44:43.000000000 -0400
-@@ -43,6 +43,24 @@
- files_search_etc($1)
- ')
-
-+######################################
-+##
-+## dontaudit read and write an leaked file descriptors
-+##
-+##
-+##
-+## The type of the process performing this action.
-+##
-+##
-+#
-+interface(`munin_dontaudit_leaks',`
-+ gen_require(`
-+ type munin_t;
-+ ')
-+
-+ dontaudit $1 munin_t:tcp_socket { read write };
-+')
-+
- #######################################
- ##
- ## Append to the munin log.
-@@ -102,6 +120,54 @@
- dontaudit $1 munin_var_lib_t:dir search_dir_perms;
- ')
-
-+######################################
-+##
-+## Create a set of derived types for various
-+## munin plugins,
-+##
-+##
-+##
-+## The name to be used for deriving type names.
-+##
-+##
-+#
-+template(`munin_plugin_template',`
-+
-+ gen_require(`
-+ type munin_t, munin_exec_t;
-+ type munin_etc_t;
-+ ')
-+
-+ type munin_$1_plugin_t;
-+ type munin_$1_plugin_exec_t;
-+ application_domain(munin_$1_plugin_t, munin_$1_plugin_exec_t)
-+ role system_r types munin_$1_plugin_t;
-+
-+ type munin_$1_plugin_tmp_t;
-+ files_tmp_file(munin_$1_plugin_tmp_t)
-+
-+ allow munin_$1_plugin_t self:fifo_file rw_fifo_file_perms;
-+
-+ manage_files_pattern(munin_$1_plugin_t, munin_$1_plugin_tmp_t, munin_$1_plugin_tmp_t)
-+ manage_dirs_pattern(munin_$1_plugin_t, munin_$1_plugin_tmp_t, munin_$1_plugin_tmp_t)
-+ files_tmp_filetrans(munin_$1_plugin_t, munin_$1_plugin_tmp_t, { dir file })
-+
-+ # automatic transition rules from munin domain
-+ # to specific munin plugin domain
-+ domtrans_pattern(munin_t, munin_$1_plugin_exec_t, munin_$1_plugin_t)
-+
-+ allow munin_$1_plugin_t munin_exec_t:file read_file_perms;
-+ allow munin_$1_plugin_t munin_t:tcp_socket rw_socket_perms;
-+
-+ read_lnk_files_pattern(munin_$1_plugin_t, munin_etc_t, munin_etc_t)
-+
-+ kernel_read_system_state(munin_$1_plugin_t)
-+
-+ corecmd_exec_bin(munin_$1_plugin_t)
-+
-+ miscfiles_read_localization(munin_$1_plugin_t)
-+')
-+
- ########################################
- ##
- ## All of the rules required to administrate
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/munin.te serefpolicy-3.7.15/policy/modules/services/munin.te
---- nsaserefpolicy/policy/modules/services/munin.te 2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/munin.te 2010-03-18 10:44:43.000000000 -0400
-@@ -28,12 +28,26 @@
- type munin_var_run_t alias lrrd_var_run_t;
- files_pid_file(munin_var_run_t)
-
-+# munin plugins declaration
-+
-+munin_plugin_template(disk)
-+permissive munin_disk_plugin_t;
-+
-+munin_plugin_template(mail)
-+permissive munin_mail_plugin_t;
-+
-+munin_plugin_template(services)
-+permissive munin_services_plugin_t;
-+
-+munin_plugin_template(system)
-+permissive munin_system_plugin_t;
-+
- ########################################
- #
- # Local policy
- #
-
--allow munin_t self:capability { chown dac_override setgid setuid };
-+allow munin_t self:capability { chown dac_override setgid setuid sys_rawio };
- dontaudit munin_t self:capability sys_tty_config;
- allow munin_t self:process { getsched setsched signal_perms };
- allow munin_t self:unix_stream_socket { create_stream_socket_perms connectto };
-@@ -55,7 +69,8 @@
-
- manage_dirs_pattern(munin_t, munin_tmp_t, munin_tmp_t)
- manage_files_pattern(munin_t, munin_tmp_t, munin_tmp_t)
--files_tmp_filetrans(munin_t, munin_tmp_t, { file dir })
-+manage_sock_files_pattern(munin_t, munin_tmp_t, munin_tmp_t)
-+files_tmp_filetrans(munin_t, munin_tmp_t, { file dir sock_file })
-
- # Allow access to the munin databases
- manage_dirs_pattern(munin_t, munin_var_lib_t, munin_var_lib_t)
-@@ -131,8 +146,13 @@
- ')
-
- optional_policy(`
-+ lpd_domtrans_lpr(munin_t)
-+')
-+
-+optional_policy(`
- mta_read_config(munin_t)
- mta_send_mail(munin_t)
-+ mta_list_queue(munin_t)
- mta_read_queue(munin_t)
- ')
-
-@@ -147,6 +167,7 @@
-
- optional_policy(`
- postfix_list_spool(munin_t)
-+ postfix_getattr_spool_files(munin_t)
- ')
-
- optional_policy(`
-@@ -164,3 +185,146 @@
- optional_policy(`
- udev_read_db(munin_t)
- ')
-+
-+###################################
-+#
-+# local policy for disk plugins
-+#
-+
-+allow munin_disk_plugin_t self:tcp_socket create_stream_socket_perms;
-+
-+rw_files_pattern(munin_disk_plugin_t, munin_var_lib_t, munin_var_lib_t)
-+
-+corenet_tcp_connect_hddtemp_port(munin_disk_plugin_t)
-+
-+corecmd_exec_shell(munin_disk_plugin_t)
-+
-+files_read_etc_files(munin_disk_plugin_t)
-+files_read_etc_runtime_files(munin_disk_plugin_t)
-+
-+fs_getattr_all_fs(munin_disk_plugin_t)
-+
-+dev_read_sysfs(munin_disk_plugin_t)
-+dev_read_urand(munin_disk_plugin_t)
-+
-+storage_getattr_fixed_disk_dev(munin_disk_plugin_t)
-+
-+sysnet_read_config(munin_disk_plugin_t)
-+
-+optional_policy(`
-+ hddtemp_exec(munin_disk_plugin_t)
-+')
-+
-+optional_policy(`
-+ fstools_exec(munin_disk_plugin_t)
-+')
-+
-+####################################
-+#
-+# local policy for mail plugins
-+#
-+
-+allow munin_mail_plugin_t self:capability dac_override;
-+
-+rw_files_pattern(munin_mail_plugin_t, munin_var_lib_t, munin_var_lib_t)
-+
-+dev_read_urand(munin_mail_plugin_t)
-+
-+files_read_etc_files(munin_mail_plugin_t)
-+
-+fs_getattr_all_fs(munin_mail_plugin_t)
-+
-+logging_read_generic_logs(munin_mail_plugin_t)
-+
-+mta_read_config(munin_mail_plugin_t)
-+mta_send_mail(munin_mail_plugin_t)
-+mta_list_queue(munin_mail_plugin_t)
-+mta_read_queue(munin_mail_plugin_t)
-+
-+optional_policy(`
-+ postfix_read_config(munin_mail_plugin_t)
-+ postfix_list_spool(munin_mail_plugin_t)
-+ postfix_getattr_spool_files(munin_mail_plugin_t)
-+')
-+
-+optional_policy(`
-+ sendmail_read_log(munin_mail_plugin_t)
-+')
-+
-+###################################
-+#
-+# local policy for service plugins
-+#
-+
-+allow munin_services_plugin_t self:tcp_socket create_stream_socket_perms;
-+allow munin_services_plugin_t self:udp_socket create_socket_perms;
-+allow munin_services_plugin_t self:netlink_route_socket r_netlink_socket_perms;
-+
-+corenet_tcp_connect_all_ports(munin_services_plugin_t)
-+corenet_tcp_connect_http_port(munin_services_plugin_t)
-+
-+dev_read_urand(munin_services_plugin_t)
-+dev_read_rand(munin_services_plugin_t)
-+
-+fs_getattr_all_fs(munin_services_plugin_t)
-+
-+files_read_etc_files(munin_services_plugin_t)
-+
-+sysnet_read_config(munin_services_plugin_t)
-+
-+optional_policy(`
-+ cups_stream_connect(munin_services_plugin_t)
-+')
-+
-+optional_policy(`
-+ lpd_exec_lpr(munin_services_plugin_t)
-+')
-+
-+optional_policy(`
-+ mysql_read_config(munin_services_plugin_t)
-+ mysql_stream_connect(munin_services_plugin_t)
-+')
-+
-+optional_policy(`
-+ netutils_domtrans_ping(munin_services_plugin_t)
-+')
-+
-+optional_policy(`
-+ postgresql_stream_connect(munin_services_plugin_t)
-+')
-+
-+optional_policy(`
-+ snmp_read_snmp_var_lib_files(munin_services_plugin_t)
-+')
-+
-+optional_policy(`
-+ varnishd_read_lib_files(munin_services_plugin_t)
-+')
-+
-+##################################
-+#
-+# local policy for system plugins
-+#
-+
-+allow munin_system_plugin_t self:udp_socket create_socket_perms;
-+
-+rw_files_pattern(munin_system_plugin_t, munin_var_lib_t, munin_var_lib_t)
-+
-+kernel_read_network_state(munin_system_plugin_t)
-+kernel_read_all_sysctls(munin_system_plugin_t)
-+
-+corecmd_exec_shell(munin_system_plugin_t)
-+
-+fs_getattr_all_fs(munin_system_plugin_t)
-+
-+dev_read_sysfs(munin_system_plugin_t)
-+dev_read_urand(munin_system_plugin_t)
-+
-+domain_read_all_domains_state(munin_system_plugin_t)
-+
-+# needed by users plugin
-+init_read_utmp(munin_system_plugin_t)
-+
-+sysnet_exec_ifconfig(munin_system_plugin_t)
-+
-+term_getattr_unallocated_ttys(munin_system_plugin_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.te serefpolicy-3.7.15/policy/modules/services/mysql.te
---- nsaserefpolicy/policy/modules/services/mysql.te 2010-03-12 11:48:14.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/mysql.te 2010-03-18 10:44:43.000000000 -0400
-@@ -65,6 +65,7 @@
-
- manage_dirs_pattern(mysqld_t, mysqld_db_t, mysqld_db_t)
- manage_files_pattern(mysqld_t, mysqld_db_t, mysqld_db_t)
-+manage_sock_files_pattern(mysqld_t, mysqld_db_t, mysqld_db_t)
- manage_lnk_files_pattern(mysqld_t, mysqld_db_t, mysqld_db_t)
- files_var_lib_filetrans(mysqld_t, mysqld_db_t, { dir file lnk_file })
-
-@@ -176,6 +177,7 @@
-
- domain_read_all_domains_state(mysqld_safe_t)
-
-+files_dontaudit_search_all_mountpoints(mysqld_safe_t)
- files_read_etc_files(mysqld_safe_t)
- files_read_usr_files(mysqld_safe_t)
- files_dontaudit_getattr_all_dirs(mysqld_safe_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.fc serefpolicy-3.7.15/policy/modules/services/nagios.fc
---- nsaserefpolicy/policy/modules/services/nagios.fc 2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/nagios.fc 2010-03-18 10:44:43.000000000 -0400
-@@ -1,16 +1,89 @@
- /etc/nagios(/.*)? gen_context(system_u:object_r:nagios_etc_t,s0)
- /etc/nagios/nrpe\.cfg -- gen_context(system_u:object_r:nrpe_etc_t,s0)
-+/etc/rc\.d/init\.d/nagios -- gen_context(system_u:object_r:nagios_initrc_exec_t,s0)
-+/etc/rc\.d/init\.d/nrpe -- gen_context(system_u:object_r:nagios_initrc_exec_t,s0)
-
--/usr/bin/nagios -- gen_context(system_u:object_r:nagios_exec_t,s0)
--/usr/bin/nrpe -- gen_context(system_u:object_r:nrpe_exec_t,s0)
-+/usr/s?bin/nagios -- gen_context(system_u:object_r:nagios_exec_t,s0)
-+/usr/s?bin/nrpe -- gen_context(system_u:object_r:nrpe_exec_t,s0)
-
--/usr/lib(64)?/cgi-bin/netsaint/.+ -- gen_context(system_u:object_r:nagios_cgi_exec_t,s0)
--/usr/lib(64)?/nagios/cgi/.+ -- gen_context(system_u:object_r:nagios_cgi_exec_t,s0)
-+/usr/lib(64)?/cgi-bin/netsaint(/.*)? gen_context(system_u:object_r:httpd_nagios_script_exec_t,s0)
-+/usr/lib(64)?/nagios/cgi(/.*)? gen_context(system_u:object_r:httpd_nagios_script_exec_t,s0)
-+#/usr/lib(64)?/nagios/plugins(/.*)? gen_context(system_u:object_r:nagios_plugin_exec_t,s0)
-
- /var/log/nagios(/.*)? gen_context(system_u:object_r:nagios_log_t,s0)
- /var/log/netsaint(/.*)? gen_context(system_u:object_r:nagios_log_t,s0)
-
-+/var/run/nagios.* gen_context(system_u:object_r:nagios_var_run_t,s0)
-+
-+/var/spool/nagios(/.*)? gen_context(system_u:object_r:nagios_spool_t,s0)
-+
- ifdef(`distro_debian',`
- /usr/sbin/nagios -- gen_context(system_u:object_r:nagios_exec_t,s0)
--/usr/lib/cgi-bin/nagios/.+ -- gen_context(system_u:object_r:nagios_cgi_exec_t,s0)
- ')
-+/usr/lib(64)?/cgi-bin/nagios(/.+)? gen_context(system_u:object_r:httpd_nagios_script_exec_t,s0)
-+/usr/lib(64)?/nagios/cgi-bin(/.*)? gen_context(system_u:object_r:httpd_nagios_script_exec_t,s0)
-+
-+# admin plugins
-+/usr/lib(64)?/nagios/plugins/check_file_age -- gen_context(system_u:object_r:nagios_admin_plugin_exec_t,s0)
-+
-+# check disk plugins
-+/usr/lib(64)?/nagios/plugins/check_disk -- gen_context(system_u:object_r:nagios_checkdisk_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_disk_smb -- gen_context(system_u:object_r:nagios_checkdisk_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_ide_smart -- gen_context(system_u:object_r:nagios_checkdisk_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_linux_raid -- gen_context(system_u:object_r:nagios_checkdisk_plugin_exec_t,s0)
-+
-+# mail plugins
-+/usr/lib(64)?/nagios/plugins/check_mailq -- gen_context(system_u:object_r:nagios_mail_plugin_exec_t,s0)
-+
-+# system plugins
-+/usr/lib(64)?/nagios/plugins/check_breeze -- gen_context(system_u:object_r:nagios_services_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_dummy -- gen_context(system_u:object_r:nagios_services_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_flexlm -- gen_context(system_u:object_r:nagios_system_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_ifoperstatus -- gen_context(system_u:object_r:nagios_system_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_ifstatus -- gen_context(system_u:object_r:nagios_system_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_load -- gen_context(system_u:object_r:nagios_system_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_log -- gen_context(system_u:object_r:nagios_system_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_mrtg -- gen_context(system_u:object_r:nagios_system_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_mrtgtraf -- gen_context(system_u:object_r:nagios_system_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_nagios -- gen_context(system_u:object_r:nagios_system_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_nwstat -- gen_context(system_u:object_r:nagios_system_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_overcr -- gen_context(system_u:object_r:nagios_system_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_procs -- gen_context(system_u:object_r:nagios_system_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_sensors -- gen_context(system_u:object_r:nagios_system_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_swap -- gen_context(system_u:object_r:nagios_system_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_users -- gen_context(system_u:object_r:nagios_system_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_wave -- gen_context(system_u:object_r:nagios_system_plugin_exec_t,s0)
-+
-+# services plugins
-+/usr/lib(64)?/nagios/plugins/check_cluster -- gen_context(system_u:object_r:nagios_services_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_dhcp -- gen_context(system_u:object_r:nagios_services_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_dig -- gen_context(system_u:object_r:nagios_services_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_dns -- gen_context(system_u:object_r:nagios_services_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_game -- gen_context(system_u:object_r:nagios_services_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_fping -- gen_context(system_u:object_r:nagios_services_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_hpjd -- gen_context(system_u:object_r:nagios_services_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_http -- gen_context(system_u:object_r:nagios_services_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_icmp -- gen_context(system_u:object_r:nagios_services_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_ircd -- gen_context(system_u:object_r:nagios_services_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_ldap -- gen_context(system_u:object_r:nagios_services_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_mysql -- gen_context(system_u:object_r:nagios_services_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_mysql_query -- gen_context(system_u:object_r:nagios_services_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_nrpe -- gen_context(system_u:object_r:nagios_services_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_nt -- gen_context(system_u:object_r:nagios_services_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_ntp.* -- gen_context(system_u:object_r:nagios_services_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_oracle -- gen_context(system_u:object_r:nagios_services_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_pgsql -- gen_context(system_u:object_r:nagios_services_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_ping -- gen_context(system_u:object_r:nagios_services_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_radius -- gen_context(system_u:object_r:nagios_services_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_real -- gen_context(system_u:object_r:nagios_services_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_rpc -- gen_context(system_u:object_r:nagios_services_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_tcp -- gen_context(system_u:object_r:nagios_services_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_time -- gen_context(system_u:object_r:nagios_services_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_sip -- gen_context(system_u:object_r:nagios_services_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_smtp -- gen_context(system_u:object_r:nagios_services_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_snmp.* -- gen_context(system_u:object_r:nagios_services_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_ssh -- gen_context(system_u:object_r:nagios_services_plugin_exec_t,s0)
-+/usr/lib(64)?/nagios/plugins/check_ups -- gen_context(system_u:object_r:nagios_services_plugin_exec_t,s0)
-+
-+# unconfined plugins
-+/usr/lib(64)?/nagios/plugins/check_by_ssh -- gen_context(system_u:object_r:nagios_unconfined_plugin_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.if serefpolicy-3.7.15/policy/modules/services/nagios.if
---- nsaserefpolicy/policy/modules/services/nagios.if 2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/nagios.if 2010-03-18 10:44:43.000000000 -0400
-@@ -64,8 +64,8 @@
-
- ########################################
- ##
--## Execute the nagios CGI with
--## a domain transition.
-+## Allow the specified domain to read
-+## nagios temporary files.
- ##
- ##
- ##
-@@ -73,12 +73,13 @@
- ##
- ##
- #
--interface(`nagios_domtrans_cgi',`
-+interface(`nagios_rw_inerited_tmp_files',`
- gen_require(`
-- type nagios_cgi_t, nagios_cgi_exec_t;
-+ type nagios_tmp_t;
- ')
-
-- domtrans_pattern($1, nagios_cgi_exec_t, nagios_cgi_t)
-+ allow $1 nagios_tmp_t:file rw_inherited_file_perms;
-+ files_search_tmp($1)
- ')
-
- ########################################
-@@ -99,3 +100,134 @@
-
- domtrans_pattern($1, nrpe_exec_t, nrpe_t)
- ')
-+
-+########################################
-+##
-+## Search nagios spool directories.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`nagios_search_spool',`
-+ gen_require(`
-+ type nagios_spool_t;
-+ ')
-+
-+ allow $1 nagios_spool_t:dir search_dir_perms;
-+ files_search_spool($1)
-+')
-+
-+######################################
-+##
-+## Read nagios logs.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`nagios_read_log',`
-+ gen_require(`
-+ type nagios_log_t;
-+ ')
-+
-+ logging_search_logs($1)
-+ read_files_pattern($1, nagios_log_t, nagios_log_t)
-+')
-+
-+########################################
-+##
-+## Create a set of derived types for various
-+## nagios plugins,
-+##
-+##
-+##
-+## The name to be used for deriving type names.
-+##
-+##
-+#
-+template(`nagios_plugin_template',`
-+
-+ gen_require(`
-+ type nagios_t, nrpe_t;
-+ type nagios_log_t;
-+ ')
-+
-+ type nagios_$1_plugin_t;
-+ type nagios_$1_plugin_exec_t;
-+ application_domain(nagios_$1_plugin_t, nagios_$1_plugin_exec_t)
-+ role system_r types nagios_$1_plugin_t;
-+
-+ allow nagios_$1_plugin_t self:fifo_file rw_fifo_file_perms;
-+
-+ # automatic transition rules from nrpe domain
-+ # to specific nagios plugin domain
-+ domtrans_pattern(nrpe_t, nagios_$1_plugin_exec_t, nagios_$1_plugin_t)
-+
-+ # needed by command.cfg
-+ domtrans_pattern(nagios_t, nagios_$1_plugin_exec_t, nagios_$1_plugin_t)
-+
-+ allow nagios_t nagios_$1_plugin_t:process signal_perms;
-+
-+ # cjp: leaked file descriptor
-+ dontaudit nagios_$1_plugin_t nrpe_t:tcp_socket { read write };
-+ dontaudit nagios_$1_plugin_t nagios_log_t:file { read write };
-+
-+ miscfiles_read_localization(nagios_$1_plugin_t)
-+')
-+
-+########################################
-+##
-+## All of the rules required to administrate
-+## an nagios environment
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+##
-+##
-+## The role to be allowed to manage the nagios domain.
-+##
-+##
-+##
-+#
-+interface(`nagios_admin',`
-+ gen_require(`
-+ type nagios_t, nrpe_t;
-+ type nagios_tmp_t, nagios_log_t;
-+ type nagios_etc_t, nrpe_etc_t;
-+ type nagios_spool_t, nagios_var_run_t;
-+ type nagios_initrc_exec_t;
-+ ')
-+
-+ allow $1 nagios_t:process { ptrace signal_perms };
-+ ps_process_pattern($1, nagios_t)
-+
-+ init_labeled_script_domtrans($1, nagios_initrc_exec_t)
-+ domain_system_change_exemption($1)
-+ role_transition $2 nagios_initrc_exec_t system_r;
-+ allow $2 system_r;
-+
-+ files_list_tmp($1)
-+ admin_pattern($1, nagios_tmp_t)
-+
-+ logging_list_logs($1)
-+ admin_pattern($1, nagios_log_t)
-+
-+ files_list_etc($1)
-+ admin_pattern($1, nagios_etc_t)
-+
-+ files_list_spool($1)
-+ admin_pattern($1, nagios_spool_t)
-+
-+ files_list_pids($1)
-+ admin_pattern($1, nagios_var_run_t)
-+
-+ admin_pattern($1, nrpe_etc_t)
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.te serefpolicy-3.7.15/policy/modules/services/nagios.te
---- nsaserefpolicy/policy/modules/services/nagios.te 2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/nagios.te 2010-03-18 10:44:43.000000000 -0400
-@@ -6,17 +6,23 @@
- # Declarations
- #
-
-+##
-+##
-+## Allow fenced domain to connect to the network using TCP.
-+##
-+##
-+gen_tunable(nagios_plugin_dontaudit_bind_port, false)
-+
- type nagios_t;
- type nagios_exec_t;
- init_daemon_domain(nagios_t, nagios_exec_t)
-
--type nagios_cgi_t;
--type nagios_cgi_exec_t;
--init_system_domain(nagios_cgi_t, nagios_cgi_exec_t)
--
- type nagios_etc_t;
- files_config_file(nagios_etc_t)
-
-+type nagios_initrc_exec_t;
-+init_script_file(nagios_initrc_exec_t)
-+
- type nagios_log_t;
- logging_log_file(nagios_log_t)
-
-@@ -26,6 +32,9 @@
- type nagios_var_run_t;
- files_pid_file(nagios_var_run_t)
-
-+type nagios_spool_t;
-+files_type(nagios_spool_t)
-+
- type nrpe_t;
- type nrpe_exec_t;
- init_daemon_domain(nrpe_t, nrpe_exec_t)
-@@ -33,6 +42,44 @@
- type nrpe_etc_t;
- files_config_file(nrpe_etc_t)
-
-+type nrpe_var_run_t;
-+files_pid_file(nrpe_var_run_t)
-+
-+# creates nagios_admin_plugin_exec_t for executable
-+# and nagios_admin_plugin_t for domain
-+nagios_plugin_template(admin)
-+
-+# creates nagios_checkdisk_plugin_exec_t for executable
-+# and nagios_checkdisk_plugin_t for domain
-+nagios_plugin_template(checkdisk)
-+
-+# creates nagios_mail_plugin_exec_t for executable
-+# and nagios_mail_plugin_t for domain
-+nagios_plugin_template(mail)
-+
-+# creates nagios_services_plugin_exec_t for executable
-+# and nagios_services_plugin_t for domain
-+nagios_plugin_template(services)
-+
-+# creates nagios_system_plugin_exec_t for executable
-+# and nagios_system_plugin_t for domain
-+nagios_plugin_template(system)
-+
-+type nagios_system_plugin_tmp_t;
-+files_tmp_file(nagios_system_plugin_tmp_t)
-+
-+nagios_plugin_template(unconfined)
-+
-+optional_policy(`
-+ unconfined_domain(nagios_unconfined_plugin_t)
-+')
-+
-+permissive nagios_admin_plugin_t;
-+permissive nagios_checkdisk_plugin_t;
-+permissive nagios_mail_plugin_t;
-+permissive nagios_services_plugin_t;
-+permissive nagios_system_plugin_t;
-+
- ########################################
- #
- # Nagios local policy
-@@ -60,6 +107,8 @@
- manage_files_pattern(nagios_t, nagios_var_run_t, nagios_var_run_t)
- files_pid_filetrans(nagios_t, nagios_var_run_t, file)
-
-+rw_fifo_files_pattern(nagios_t, nagios_spool_t, nagios_spool_t)
-+
- kernel_read_system_state(nagios_t)
- kernel_read_kernel_sysctls(nagios_t)
-
-@@ -76,6 +125,9 @@
- corenet_udp_sendrecv_all_ports(nagios_t)
- corenet_tcp_connect_all_ports(nagios_t)
-
-+corenet_dontaudit_tcp_bind_all_reserved_ports(nagios_t)
-+corenet_dontaudit_udp_bind_all_reserved_ports(nagios_t)
-+
- dev_read_sysfs(nagios_t)
- dev_read_urand(nagios_t)
-
-@@ -86,6 +138,7 @@
- files_read_etc_files(nagios_t)
- files_read_etc_runtime_files(nagios_t)
- files_read_kernel_symbol_table(nagios_t)
-+files_search_spool(nagios_t)
-
- fs_getattr_all_fs(nagios_t)
- fs_search_auto_mountpoints(nagios_t)
-@@ -118,61 +171,63 @@
- udev_read_db(nagios_t)
- ')
-
--# cjp: leaked file descriptors:
--# for open file handles
--#dontaudit system_mail_t nagios_etc_t:file read;
--#dontaudit system_mail_t nagios_log_t:fifo_file read;
--
- ########################################
- #
- # Nagios CGI local policy
- #
-+apache_content_template(nagios)
-+typealias httpd_nagios_script_t alias nagios_cgi_t;
-+typealias httpd_nagios_script_exec_t alias nagios_cgi_exec_t;
-
--allow nagios_cgi_t self:process signal_perms;
--allow nagios_cgi_t self:fifo_file rw_fifo_file_perms;
--
--read_files_pattern(nagios_cgi_t, nagios_t, nagios_t)
--read_lnk_files_pattern(nagios_cgi_t, nagios_t, nagios_t)
--
--allow nagios_cgi_t nagios_etc_t:dir list_dir_perms;
--read_files_pattern(nagios_cgi_t, nagios_etc_t, nagios_etc_t)
--read_lnk_files_pattern(nagios_cgi_t, nagios_etc_t, nagios_etc_t)
-+allow httpd_nagios_script_t self:process signal_perms;
-
--allow nagios_cgi_t nagios_log_t:dir list_dir_perms;
--read_files_pattern(nagios_cgi_t, nagios_etc_t, nagios_log_t)
--read_lnk_files_pattern(nagios_cgi_t, nagios_etc_t, nagios_log_t)
-+read_files_pattern(httpd_nagios_script_t, nagios_t, nagios_t)
-+read_lnk_files_pattern(httpd_nagios_script_t, nagios_t, nagios_t)
-
--kernel_read_system_state(nagios_cgi_t)
-+files_search_spool(httpd_nagios_script_t)
-+rw_fifo_files_pattern(httpd_nagios_script_t, nagios_spool_t, nagios_spool_t)
-
--corecmd_exec_bin(nagios_cgi_t)
-+allow httpd_nagios_script_t nagios_etc_t:dir list_dir_perms;
-+read_files_pattern(httpd_nagios_script_t, nagios_etc_t, nagios_etc_t)
-+read_lnk_files_pattern(httpd_nagios_script_t, nagios_etc_t, nagios_etc_t)
-
--domain_dontaudit_read_all_domains_state(nagios_cgi_t)
-+allow httpd_nagios_script_t nagios_log_t:dir list_dir_perms;
-+read_files_pattern(httpd_nagios_script_t, nagios_etc_t, nagios_log_t)
-+read_lnk_files_pattern(httpd_nagios_script_t, nagios_etc_t, nagios_log_t)
-
--files_read_etc_files(nagios_cgi_t)
--files_read_etc_runtime_files(nagios_cgi_t)
--files_read_kernel_symbol_table(nagios_cgi_t)
-+kernel_read_system_state(httpd_nagios_script_t)
-
--logging_send_syslog_msg(nagios_cgi_t)
--logging_search_logs(nagios_cgi_t)
-+domain_dontaudit_read_all_domains_state(httpd_nagios_script_t)
-
--miscfiles_read_localization(nagios_cgi_t)
-+files_read_etc_runtime_files(httpd_nagios_script_t)
-+files_read_kernel_symbol_table(httpd_nagios_script_t)
-
--optional_policy(`
-- apache_append_log(nagios_cgi_t)
--')
-+logging_send_syslog_msg(httpd_nagios_script_t)
-
- ########################################
- #
- # Nagios remote plugin executor local policy
- #
-
--dontaudit nrpe_t self:capability sys_tty_config;
--allow nrpe_t self:process { setpgid signal_perms };
-+allow nrpe_t self:capability { setuid setgid };
-+dontaudit nrpe_t self:capability {sys_tty_config sys_resource};
-+allow nrpe_t self:process { setpgid signal_perms setsched setrlimit };
- allow nrpe_t self:fifo_file rw_fifo_file_perms;
-+allow nrpe_t self:tcp_socket create_stream_socket_perms;
-+
-+domtrans_pattern(nrpe_t, nagios_checkdisk_plugin_exec_t, nagios_checkdisk_plugin_t)
-
--allow nrpe_t nrpe_etc_t:file read_file_perms;
-+read_files_pattern(nrpe_t, nagios_etc_t, nagios_etc_t)
- files_search_etc(nrpe_t)
-
-+manage_files_pattern(nrpe_t, nrpe_var_run_t, nrpe_var_run_t)
-+files_pid_filetrans(nrpe_t,nrpe_var_run_t,file)
-+files_read_etc_files(nrpe_t)
-+
-+corenet_tcp_bind_generic_node(nrpe_t)
-+corenet_tcp_bind_inetd_child_port(nrpe_t)
-+corenet_sendrecv_unlabeled_packets(nrpe_t)
-+
- kernel_read_system_state(nrpe_t)
- kernel_read_kernel_sysctls(nrpe_t)
-
-@@ -183,11 +238,15 @@
- dev_read_urand(nrpe_t)
-
- domain_use_interactive_fds(nrpe_t)
-+domain_read_all_domains_state(nrpe_t)
-
- files_read_etc_runtime_files(nrpe_t)
-
-+fs_getattr_all_fs(nrpe_t)
- fs_search_auto_mountpoints(nrpe_t)
-
-+auth_use_nsswitch(nrpe_t)
-+
- logging_send_syslog_msg(nrpe_t)
-
- miscfiles_read_localization(nrpe_t)
-@@ -199,6 +258,11 @@
- ')
-
- optional_policy(`
-+ mta_send_mail(nrpe_t)
-+ mta_dontaudit_leaks_system_mail(nrpe_t)
-+')
-+
-+optional_policy(`
- seutil_sigchld_newrole(nrpe_t)
- ')
-
-@@ -209,3 +273,149 @@
- optional_policy(`
- udev_read_db(nrpe_t)
- ')
-+
-+#####################################
-+#
-+# local policy for admin check plugins
-+#
-+
-+corecmd_read_bin_files(nagios_admin_plugin_t)
-+corecmd_read_bin_symlinks(nagios_admin_plugin_t)
-+
-+dev_read_urand(nagios_admin_plugin_t)
-+
-+files_read_etc_files(nagios_admin_plugin_t)
-+
-+# for check_file_age plugin
-+files_getattr_all_dirs(nagios_admin_plugin_t)
-+files_getattr_all_files(nagios_admin_plugin_t)
-+files_getattr_all_symlinks(nagios_admin_plugin_t)
-+files_getattr_all_pipes(nagios_admin_plugin_t)
-+files_getattr_all_sockets(nagios_admin_plugin_t)
-+files_getattr_all_file_type_fs(nagios_admin_plugin_t)
-+dev_getattr_all_chr_files(nagios_admin_plugin_t)
-+dev_getattr_all_blk_files(nagios_admin_plugin_t)
-+
-+######################################
-+#
-+# local policy for mail check plugins
-+#
-+
-+allow nagios_mail_plugin_t self:capability { setuid setgid dac_override };
-+
-+allow nagios_mail_plugin_t self:netlink_route_socket r_netlink_socket_perms;
-+allow nagios_mail_plugin_t self:tcp_socket create_stream_socket_perms;
-+allow nagios_mail_plugin_t self:udp_socket create_socket_perms;
-+
-+kernel_read_system_state(nagios_mail_plugin_t)
-+kernel_read_kernel_sysctls(nagios_mail_plugin_t)
-+
-+corecmd_read_bin_files(nagios_mail_plugin_t)
-+corecmd_read_bin_symlinks(nagios_mail_plugin_t)
-+
-+dev_read_urand(nagios_mail_plugin_t)
-+
-+files_read_etc_files(nagios_mail_plugin_t)
-+
-+libs_use_lib_files(nagios_mail_plugin_t)
-+libs_use_ld_so(nagios_mail_plugin_t)
-+
-+logging_send_syslog_msg(nagios_mail_plugin_t)
-+
-+sysnet_read_config(nagios_mail_plugin_t)
-+
-+nscd_dontaudit_search_pid(nagios_mail_plugin_t)
-+
-+optional_policy(`
-+ mta_send_mail(nagios_mail_plugin_t)
-+')
-+
-+optional_policy(`
-+ postfix_stream_connect_master(nagios_mail_plugin_t)
-+ posftix_exec_postqueue(nagios_mail_plugin_t)
-+')
-+
-+######################################
-+#
-+# local policy for disk check plugins
-+#
-+
-+# needed by ioctl()
-+allow nagios_checkdisk_plugin_t self:capability { sys_admin sys_rawio };
-+
-+files_read_etc_runtime_files(nagios_checkdisk_plugin_t)
-+
-+fs_getattr_all_fs(nagios_checkdisk_plugin_t)
-+
-+storage_raw_read_fixed_disk(nagios_checkdisk_plugin_t)
-+
-+
-+#######################################
-+#
-+# local policy for service check plugins
-+#
-+allow nagios_services_plugin_t self:capability { net_bind_service net_raw };
-+allow nagios_services_plugin_t self:process { signal sigkill };
-+
-+allow nagios_services_plugin_t self:tcp_socket create_stream_socket_perms;
-+allow nagios_services_plugin_t self:udp_socket create_socket_perms;
-+
-+corecmd_exec_bin(nagios_services_plugin_t)
-+
-+corenet_tcp_connect_all_ports(nagios_services_plugin_t)
-+corenet_udp_bind_dhcpc_port(nagios_services_plugin_t)
-+
-+auth_use_nsswitch(nagios_services_plugin_t)
-+
-+domain_read_all_domains_state(nagios_services_plugin_t)
-+
-+files_read_usr_files(nagios_services_plugin_t)
-+
-+# just workaround for now
-+tunable_policy(`nagios_plugin_dontaudit_bind_port',`
-+ corenet_dontaudit_tcp_bind_all_ports(nagios_services_plugin_t)
-+ corenet_dontaudit_udp_bind_all_ports(nagios_services_plugin_t)
-+')
-+
-+optional_policy(`
-+ netutils_domtrans_ping(nagios_services_plugin_t)
-+')
-+
-+optional_policy(`
-+ mysql_stream_connect(nagios_services_plugin_t)
-+')
-+
-+optional_policy(`
-+ snmp_read_snmp_var_lib_files(nagios_services_plugin_t)
-+')
-+
-+######################################
-+#
-+# local policy for system check plugins
-+#
-+
-+allow nagios_system_plugin_t self:capability dac_override;
-+dontaudit nagios_system_plugin_t self:capability { setuid setgid };
-+
-+# check_log
-+manage_files_pattern(nagios_system_plugin_t, nagios_system_plugin_tmp_t, nagios_system_plugin_tmp_t)
-+manage_dirs_pattern(nagios_system_plugin_t, nagios_system_plugin_tmp_t, nagios_system_plugin_tmp_t)
-+files_tmp_filetrans(nagios_system_plugin_t, nagios_system_plugin_tmp_t, { dir file })
-+
-+corecmd_exec_bin(nagios_system_plugin_t)
-+corecmd_exec_shell(nagios_system_plugin_t)
-+
-+kernel_read_system_state(nagios_system_plugin_t)
-+kernel_read_kernel_sysctls(nagios_system_plugin_t)
-+
-+files_read_etc_files(nagios_system_plugin_t)
-+
-+dev_read_sysfs(nagios_system_plugin_t)
-+dev_read_urand(nagios_system_plugin_t)
-+
-+domain_read_all_domains_state(nagios_system_plugin_t)
-+
-+# needed by check_users plugin
-+optional_policy(`
-+ init_read_utmp(nagios_system_plugin_t)
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.fc serefpolicy-3.7.15/policy/modules/services/networkmanager.fc
---- nsaserefpolicy/policy/modules/services/networkmanager.fc 2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/networkmanager.fc 2010-03-18 10:44:43.000000000 -0400
-@@ -1,12 +1,32 @@
-+/etc/rc\.d/init\.d/wicd -- gen_context(system_u:object_r:NetworkManager_initrc_exec_t, s0)
-+/etc/NetworkManager/dispatcher\.d(/.*) gen_context(system_u:object_r:NetworkManager_initrc_exec_t,s0)
-+/etc/wicd/manager-settings.conf -- gen_context(system_u:object_r:NetworkManager_var_lib_t, s0)
-+/etc/wicd/wireless-settings.conf -- gen_context(system_u:object_r:NetworkManager_var_lib_t, s0)
-+/etc/wicd/wired-settings.conf -- gen_context(system_u:object_r:NetworkManager_var_lib_t, s0)
-+
-+/usr/libexec/nm-dispatcher.action -- gen_context(system_u:object_r:NetworkManager_initrc_exec_t,s0)
-+
- /sbin/wpa_cli -- gen_context(system_u:object_r:wpa_cli_exec_t,s0)
- /sbin/wpa_supplicant -- gen_context(system_u:object_r:NetworkManager_exec_t,s0)
-
- /usr/s?bin/NetworkManager -- gen_context(system_u:object_r:NetworkManager_exec_t,s0)
-+/usr/sbin/wicd -- gen_context(system_u:object_r:NetworkManager_exec_t, s0)
- /usr/s?bin/wpa_supplicant -- gen_context(system_u:object_r:NetworkManager_exec_t,s0)
-+/usr/sbin/NetworkManagerDispatcher -- gen_context(system_u:object_r:NetworkManager_exec_t,s0)
-+/usr/sbin/nm-system-settings -- gen_context(system_u:object_r:NetworkManager_exec_t,s0)
-+
-+/var/lib/wicd(/.*)? gen_context(system_u:object_r:NetworkManager_var_lib_t, s0)
-+/var/lib/NetworkManager(/.*)? gen_context(system_u:object_r:NetworkManager_var_lib_t, s0)
-
-+/etc/NetworkManager/system-connections(/.*)? gen_context(system_u:object_r:NetworkManager_var_lib_t, s0)
-+/etc/NetworkManager(/.*)? gen_context(system_u:object_r:NetworkManager_var_lib_t, s0)
-+
-+/var/log/wicd(/.*)? gen_context(system_u:object_r:NetworkManager_log_t,s0)
- /var/log/wpa_supplicant.* -- gen_context(system_u:object_r:NetworkManager_log_t,s0)
-
- /var/run/NetworkManager\.pid -- gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
- /var/run/NetworkManager(/.*)? gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
- /var/run/wpa_supplicant(/.*)? gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
- /var/run/wpa_supplicant-global -s gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
-+/var/run/nm-dhclient.* gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.if serefpolicy-3.7.15/policy/modules/services/networkmanager.if
---- nsaserefpolicy/policy/modules/services/networkmanager.if 2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/networkmanager.if 2010-03-18 10:44:43.000000000 -0400
-@@ -118,6 +118,24 @@
-
- ########################################
- ##
-+## Execute NetworkManager scripts with an automatic domain transition to initrc.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`networkmanager_initrc_domtrans',`
-+ gen_require(`
-+ type NetworkManager_initrc_exec_t;
-+ ')
-+
-+ init_labeled_script_domtrans($1, NetworkManager_initrc_exec_t)
-+')
-+
-+########################################
-+##
- ## Read NetworkManager PID files.
- ##
- ##
-@@ -134,3 +152,71 @@
- files_search_pids($1)
- allow $1 NetworkManager_var_run_t:file read_file_perms;
- ')
-+
-+########################################
-+##
-+## Read NetworkManager PID files.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`networkmanager_read_var_lib_files',`
-+ gen_require(`
-+ type NetworkManager_var_lib_t;
-+ ')
-+
-+ files_search_var_lib($1)
-+ list_dirs_pattern($1, NetworkManager_var_lib_t, NetworkManager_var_lib_t)
-+ read_files_pattern($1, NetworkManager_var_lib_t, NetworkManager_var_lib_t)
-+')
-+
-+########################################
-+##
-+## Execute NetworkManager in the NetworkManager domain, and
-+## allow the specified role the NetworkManager domain.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+##
-+##
-+## The role to be allowed the NetworkManager domain.
-+##
-+##
-+##
-+#
-+interface(`networkmanager_run',`
-+ gen_require(`
-+ type NetworkManager_t, NetworkManager_exec_t;
-+ ')
-+
-+ networkmanager_domtrans($1)
-+ role $2 types NetworkManager_t;
-+')
-+
-+
-+#######################################
-+##
-+## Allow caller to relabel tun_socket
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`networkmanager_attach_tun_iface',`
-+ gen_require(`
-+ type NetworkManager_t;
-+ ')
-+
-+ allow $1 NetworkManager_t:tun_socket relabelfrom;
-+ allow $1 self:tun_socket relabelto;
-+')
-+
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.7.15/policy/modules/services/networkmanager.te
---- nsaserefpolicy/policy/modules/services/networkmanager.te 2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/networkmanager.te 2010-03-18 10:44:43.000000000 -0400
-@@ -19,6 +19,9 @@
- type NetworkManager_tmp_t;
- files_tmp_file(NetworkManager_tmp_t)
-
-+type NetworkManager_var_lib_t;
-+files_type(NetworkManager_var_lib_t)
-+
- type NetworkManager_var_run_t;
- files_pid_file(NetworkManager_var_run_t)
-
-@@ -33,13 +36,14 @@
-
- # networkmanager will ptrace itself if gdb is installed
- # and it receives a unexpected signal (rh bug #204161)
--allow NetworkManager_t self:capability { kill setgid setuid dac_override net_admin net_raw net_bind_service ipc_lock };
-+allow NetworkManager_t self:capability { chown fsetid kill setgid setuid sys_admin sys_nice sys_ptrace dac_override net_admin net_raw net_bind_service ipc_lock };
- dontaudit NetworkManager_t self:capability { sys_tty_config sys_ptrace };
--allow NetworkManager_t self:process { ptrace setcap setpgid getsched signal_perms };
-+allow NetworkManager_t self:process { ptrace getcap setcap setpgid getsched setsched signal_perms };
- allow NetworkManager_t self:fifo_file rw_fifo_file_perms;
- allow NetworkManager_t self:unix_dgram_socket { sendto create_socket_perms };
- allow NetworkManager_t self:unix_stream_socket create_stream_socket_perms;
- allow NetworkManager_t self:netlink_route_socket create_netlink_socket_perms;
-+allow NetworkManager_t self:netlink_kobject_uevent_socket create_socket_perms;
- allow NetworkManager_t self:tcp_socket create_stream_socket_perms;
- allow NetworkManager_t self:udp_socket create_socket_perms;
- allow NetworkManager_t self:packet_socket create_socket_perms;
-@@ -51,8 +55,14 @@
- manage_files_pattern(NetworkManager_t, NetworkManager_log_t, NetworkManager_log_t)
- logging_log_filetrans(NetworkManager_t, NetworkManager_log_t, file)
-
--rw_sock_files_pattern(NetworkManager_t, NetworkManager_tmp_t, NetworkManager_tmp_t)
--files_search_tmp(NetworkManager_t)
-+can_exec(NetworkManager_t, NetworkManager_tmp_t)
-+manage_files_pattern(NetworkManager_t, NetworkManager_tmp_t, NetworkManager_tmp_t)
-+manage_sock_files_pattern(NetworkManager_t, NetworkManager_tmp_t, NetworkManager_tmp_t)
-+files_tmp_filetrans(NetworkManager_t, NetworkManager_tmp_t, { sock_file file })
-+
-+manage_dirs_pattern(NetworkManager_t, NetworkManager_var_lib_t, NetworkManager_var_lib_t)
-+manage_files_pattern(NetworkManager_t, NetworkManager_var_lib_t, NetworkManager_var_lib_t)
-+files_var_lib_filetrans(NetworkManager_t, NetworkManager_var_lib_t, dir)
-
- manage_dirs_pattern(NetworkManager_t, NetworkManager_var_run_t, NetworkManager_var_run_t)
- manage_files_pattern(NetworkManager_t, NetworkManager_var_run_t, NetworkManager_var_run_t)
-@@ -62,7 +72,9 @@
- kernel_read_system_state(NetworkManager_t)
- kernel_read_network_state(NetworkManager_t)
- kernel_read_kernel_sysctls(NetworkManager_t)
--kernel_load_module(NetworkManager_t)
-+kernel_request_load_module(NetworkManager_t)
-+kernel_read_debugfs(NetworkManager_t)
-+kernel_rw_net_sysctls(NetworkManager_t)
-
- corenet_all_recvfrom_unlabeled(NetworkManager_t)
- corenet_all_recvfrom_netlabel(NetworkManager_t)
-@@ -81,13 +93,18 @@
- corenet_sendrecv_isakmp_server_packets(NetworkManager_t)
- corenet_sendrecv_dhcpc_server_packets(NetworkManager_t)
- corenet_sendrecv_all_client_packets(NetworkManager_t)
-+corenet_rw_tun_tap_dev(NetworkManager_t)
-+corenet_getattr_ppp_dev(NetworkManager_t)
-
- dev_read_sysfs(NetworkManager_t)
- dev_read_rand(NetworkManager_t)
- dev_read_urand(NetworkManager_t)
-+dev_dontaudit_getattr_generic_blk_files(NetworkManager_t)
-+dev_getattr_all_chr_files(NetworkManager_t)
-
- fs_getattr_all_fs(NetworkManager_t)
- fs_search_auto_mountpoints(NetworkManager_t)
-+fs_list_inotifyfs(NetworkManager_t)
-
- mls_file_read_all_levels(NetworkManager_t)
-
-@@ -98,15 +115,20 @@
-
- domain_use_interactive_fds(NetworkManager_t)
- domain_read_confined_domains_state(NetworkManager_t)
--domain_dontaudit_read_all_domains_state(NetworkManager_t)
-
- files_read_etc_files(NetworkManager_t)
- files_read_etc_runtime_files(NetworkManager_t)
- files_read_usr_files(NetworkManager_t)
-+files_read_usr_src_files(NetworkManager_t)
-+
-+storage_getattr_fixed_disk_dev(NetworkManager_t)
-
- init_read_utmp(NetworkManager_t)
-+init_dontaudit_write_utmp(NetworkManager_t)
- init_domtrans_script(NetworkManager_t)
-
-+auth_use_nsswitch(NetworkManager_t)
-+
- logging_send_syslog_msg(NetworkManager_t)
-
- miscfiles_read_localization(NetworkManager_t)
-@@ -116,25 +138,40 @@
-
- seutil_read_config(NetworkManager_t)
-
--sysnet_domtrans_ifconfig(NetworkManager_t)
--sysnet_domtrans_dhcpc(NetworkManager_t)
--sysnet_signal_dhcpc(NetworkManager_t)
--sysnet_read_dhcpc_pid(NetworkManager_t)
-+sysnet_etc_filetrans_config(NetworkManager_t)
- sysnet_delete_dhcpc_pid(NetworkManager_t)
--sysnet_search_dhcp_state(NetworkManager_t)
--# in /etc created by NetworkManager will be labelled net_conf_t.
-+sysnet_domtrans_dhcpc(NetworkManager_t)
-+sysnet_domtrans_ifconfig(NetworkManager_t)
-+sysnet_kill_dhcpc(NetworkManager_t)
- sysnet_manage_config(NetworkManager_t)
--sysnet_etc_filetrans_config(NetworkManager_t)
-+sysnet_read_dhcp_config(NetworkManager_t)
-+sysnet_read_dhcpc_pid(NetworkManager_t)
-+sysnet_delete_dhcpc_state(NetworkManager_t)
-+sysnet_read_dhcpc_state(NetworkManager_t)
-+sysnet_signal_dhcpc(NetworkManager_t)
-
-+userdom_stream_connect(NetworkManager_t)
- userdom_dontaudit_use_unpriv_user_fds(NetworkManager_t)
- userdom_dontaudit_use_user_ttys(NetworkManager_t)
- # Read gnome-keyring
- userdom_read_user_home_content_files(NetworkManager_t)
-+userdom_dgram_send(NetworkManager_t)
-+
-+cron_read_system_job_lib_files(NetworkManager_t)
-+
-+optional_policy(`
-+ avahi_domtrans(NetworkManager_t)
-+ avahi_kill(NetworkManager_t)
-+ avahi_signal(NetworkManager_t)
-+ avahi_signull(NetworkManager_t)
-+')
-
- optional_policy(`
- bind_domtrans(NetworkManager_t)
- bind_manage_cache(NetworkManager_t)
-+ bind_kill(NetworkManager_t)
- bind_signal(NetworkManager_t)
-+ bind_signull(NetworkManager_t)
- ')
-
- optional_policy(`
-@@ -146,8 +183,25 @@
- ')
-
- optional_policy(`
-- dbus_system_bus_client(NetworkManager_t)
-- dbus_connect_system_bus(NetworkManager_t)
-+ dbus_system_domain(NetworkManager_t, NetworkManager_exec_t)
-+
-+ optional_policy(`
-+ consolekit_dbus_chat(NetworkManager_t)
-+ ')
-+')
-+
-+optional_policy(`
-+ dnsmasq_read_pid_files(NetworkManager_t)
-+ dnsmasq_delete_pid_files(NetworkManager_t)
-+ dnsmasq_domtrans(NetworkManager_t)
-+ dnsmasq_initrc_domtrans(NetworkManager_t)
-+ dnsmasq_kill(NetworkManager_t)
-+ dnsmasq_signal(NetworkManager_t)
-+ dnsmasq_signull(NetworkManager_t)
-+')
-+
-+optional_policy(`
-+ hal_write_log(NetworkManager_t)
- ')
-
- optional_policy(`
-@@ -155,23 +209,51 @@
- ')
-
- optional_policy(`
-- nis_use_ypbind(NetworkManager_t)
-+ iptables_domtrans(NetworkManager_t)
- ')
-
- optional_policy(`
-- nscd_socket_use(NetworkManager_t)
-+ nscd_domtrans(NetworkManager_t)
- nscd_signal(NetworkManager_t)
-+ nscd_signull(NetworkManager_t)
-+ nscd_kill(NetworkManager_t)
-+ nscd_initrc_domtrans(NetworkManager_t)
-+')
-+
-+optional_policy(`
-+ # Dispatcher starting and stoping ntp
-+ ntp_initrc_domtrans(NetworkManager_t)
- ')
-
- optional_policy(`
- openvpn_domtrans(NetworkManager_t)
-+ openvpn_kill(NetworkManager_t)
- openvpn_signal(NetworkManager_t)
-+ openvpn_signull(NetworkManager_t)
-+')
-+
-+optional_policy(`
-+ policykit_dbus_chat(NetworkManager_t)
-+ policykit_domtrans_auth(NetworkManager_t)
-+ policykit_read_lib(NetworkManager_t)
-+ policykit_read_reload(NetworkManager_t)
-+ userdom_read_all_users_state(NetworkManager_t)
- ')
-
- optional_policy(`
-+ ppp_initrc_domtrans(NetworkManager_t)
- ppp_domtrans(NetworkManager_t)
-- ppp_read_pid_files(NetworkManager_t)
-+ ppp_manage_pid_files(NetworkManager_t)
-+ ppp_kill(NetworkManager_t)
- ppp_signal(NetworkManager_t)
-+ ppp_signull(NetworkManager_t)
-+ ppp_read_config(NetworkManager_t)
-+')
-+
-+optional_policy(`
-+ rpm_exec(NetworkManager_t)
-+ rpm_read_db(NetworkManager_t)
-+ rpm_dontaudit_manage_db(NetworkManager_t)
- ')
-
- optional_policy(`
-@@ -179,12 +261,15 @@
- ')
-
- optional_policy(`
-+ udev_exec(NetworkManager_t)
- udev_read_db(NetworkManager_t)
- ')
-
- optional_policy(`
- vpn_domtrans(NetworkManager_t)
-+ vpn_kill(NetworkManager_t)
- vpn_signal(NetworkManager_t)
-+ vpn_signull(NetworkManager_t)
- ')
-
- ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.fc serefpolicy-3.7.15/policy/modules/services/nis.fc
---- nsaserefpolicy/policy/modules/services/nis.fc 2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/nis.fc 2010-03-18 10:44:43.000000000 -0400
-@@ -1,4 +1,7 @@
--
-+/etc/rc\.d/init\.d/ypbind -- gen_context(system_u:object_r:ypbind_initrc_exec_t,s0)
-+/etc/rc\.d/init\.d/yppasswd -- gen_context(system_u:object_r:nis_initrc_exec_t,s0)
-+/etc/rc\.d/init\.d/ypserv -- gen_context(system_u:object_r:nis_initrc_exec_t,s0)
-+/etc/rc\.d/init\.d/ypxfrd -- gen_context(system_u:object_r:nis_initrc_exec_t,s0)
- /etc/ypserv\.conf -- gen_context(system_u:object_r:ypserv_conf_t,s0)
-
- /sbin/ypbind -- gen_context(system_u:object_r:ypbind_exec_t,s0)
-@@ -11,3 +14,8 @@
- /usr/sbin/ypserv -- gen_context(system_u:object_r:ypserv_exec_t,s0)
-
- /var/yp(/.*)? gen_context(system_u:object_r:var_yp_t,s0)
-+
-+/var/run/ypxfrd.* -- gen_context(system_u:object_r:ypxfr_var_run_t,s0)
-+/var/run/ypbind.* -- gen_context(system_u:object_r:ypbind_var_run_t,s0)
-+/var/run/ypserv.* -- gen_context(system_u:object_r:ypserv_var_run_t,s0)
-+/var/run/yppass.* -- gen_context(system_u:object_r:yppasswdd_var_run_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.if serefpolicy-3.7.15/policy/modules/services/nis.if
---- nsaserefpolicy/policy/modules/services/nis.if 2010-03-03 23:26:37.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/nis.if 2010-03-18 10:44:43.000000000 -0400
-@@ -28,7 +28,7 @@
- type var_yp_t;
- ')
-
-- dontaudit $1 self:capability net_bind_service;
-+ allow $1 self:capability net_bind_service;
-
- allow $1 self:tcp_socket create_stream_socket_perms;
- allow $1 self:udp_socket create_socket_perms;
-@@ -88,6 +88,10 @@
- ##
- #
- interface(`nis_use_ypbind',`
-+ gen_require(`
-+ type var_yp_t;
-+ ')
-+
- tunable_policy(`allow_ypbind',`
- nis_use_ypbind_uncond($1)
- ')
-@@ -274,6 +278,43 @@
-
- ########################################
- ##
-+## Execute nis server in the nis domain.
-+##
-+##
-+##
-+## The type of the process performing this action.
-+##
-+##
-+#
-+#
-+interface(`nis_initrc_domtrans',`
-+ gen_require(`
-+ type nis_initrc_exec_t;
-+ ')
-+
-+ init_labeled_script_domtrans($1, nis_initrc_exec_t)
-+')
-+
-+########################################
-+##
-+## Execute nis server in the nis domain.
-+##
-+##
-+##
-+## The type of the process performing this action.
-+##
-+##
-+#
-+interface(`nis_ypbind_initrc_domtrans',`
-+ gen_require(`
-+ type ypbind_initrc_exec_t;
-+ ')
-+
-+ init_labeled_script_domtrans($1, ypbind_initrc_exec_t)
-+')
-+
-+########################################
-+##
- ## All of the rules required to administrate
- ## an nis environment
- ##
-@@ -294,6 +335,7 @@
- type ypbind_t, yppasswdd_t, ypserv_t, ypxfr_t;
- type ypbind_tmp_t, ypserv_tmp_t, ypserv_conf_t;
- type ypbind_var_run_t, yppasswdd_var_run_t, ypserv_var_run_t;
-+ type ypbind_initrc_exec_t, nis_initrc_exec_t;
- ')
-
- allow $1 ypbind_t:process { ptrace signal_perms };
-@@ -308,6 +350,13 @@
- allow $1 ypxfr_t:process { ptrace signal_perms };
- ps_process_pattern($1, ypxfr_t)
-
-+ nis_initrc_domtrans($1)
-+ nis_ypbind_initrc_domtrans($1)
-+ domain_system_change_exemption($1)
-+ role_transition $2 nis_initrc_exec_t system_r;
-+ role_transition $2 ypbind_initrc_exec_t system_r;
-+ allow $2 system_r;
-+
- files_list_tmp($1)
- admin_pattern($1, ypbind_tmp_t)
-
-@@ -323,3 +372,30 @@
-
- admin_pattern($1, ypserv_var_run_t)
- ')
-+
-+
-+########################################
-+##
-+## Execute ypbind in the ypbind domain, and
-+## allow the specified role the ypbind domain.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+##
-+##
-+## The role to be allowed the ypbind domain.
-+##
-+##
-+##
-+#
-+interface(`nis_run_ypbind',`
-+ gen_require(`
-+ type ypbind_t;
-+ ')
-+
-+ nis_domtrans_ypbind($1)
-+ role $2 types ypbind_t;
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-3.7.15/policy/modules/services/nis.te
---- nsaserefpolicy/policy/modules/services/nis.te 2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/nis.te 2010-03-18 10:44:43.000000000 -0400
-@@ -13,6 +13,9 @@
- type ypbind_exec_t;
- init_daemon_domain(ypbind_t, ypbind_exec_t)
-
-+type ypbind_initrc_exec_t;
-+init_script_file(ypbind_initrc_exec_t)
-+
- type ypbind_tmp_t;
- files_tmp_file(ypbind_tmp_t)
-
-@@ -44,6 +47,12 @@
- type ypxfr_exec_t;
- init_daemon_domain(ypxfr_t, ypxfr_exec_t)
-
-+type ypxfr_var_run_t;
-+files_pid_file(ypxfr_var_run_t)
-+
-+type nis_initrc_exec_t;
-+init_script_file(nis_initrc_exec_t)
-+
- ########################################
- #
- # ypbind local policy
-@@ -65,9 +74,8 @@
-
- manage_files_pattern(ypbind_t, var_yp_t, var_yp_t)
-
-+kernel_read_system_state(ypbind_t)
- kernel_read_kernel_sysctls(ypbind_t)
--kernel_list_proc(ypbind_t)
--kernel_read_proc_symlinks(ypbind_t)
-
- corenet_all_recvfrom_unlabeled(ypbind_t)
- corenet_all_recvfrom_netlabel(ypbind_t)
-@@ -136,7 +144,7 @@
- allow yppasswdd_t self:capability dac_override;
- dontaudit yppasswdd_t self:capability sys_tty_config;
- allow yppasswdd_t self:fifo_file rw_fifo_file_perms;
--allow yppasswdd_t self:process { setfscreate signal_perms };
-+allow yppasswdd_t self:process { getsched setfscreate signal_perms };
- allow yppasswdd_t self:unix_dgram_socket create_socket_perms;
- allow yppasswdd_t self:unix_stream_socket create_stream_socket_perms;
- allow yppasswdd_t self:netlink_route_socket r_netlink_socket_perms;
-@@ -250,6 +258,8 @@
- corenet_udp_sendrecv_all_ports(ypserv_t)
- corenet_tcp_bind_generic_node(ypserv_t)
- corenet_udp_bind_generic_node(ypserv_t)
-+corenet_tcp_bind_reserved_port(ypserv_t)
-+corenet_udp_bind_reserved_port(ypserv_t)
- corenet_tcp_bind_all_rpc_ports(ypserv_t)
- corenet_udp_bind_all_rpc_ports(ypserv_t)
- corenet_dontaudit_tcp_bind_all_reserved_ports(ypserv_t)
-@@ -305,6 +315,9 @@
-
- allow ypxfr_t ypserv_conf_t:file read_file_perms;
-
-+manage_files_pattern(ypxfr_t, ypxfr_var_run_t, ypxfr_var_run_t)
-+files_pid_filetrans(ypxfr_t, ypxfr_var_run_t, file)
-+
- corenet_all_recvfrom_unlabeled(ypxfr_t)
- corenet_all_recvfrom_netlabel(ypxfr_t)
- corenet_tcp_sendrecv_generic_if(ypxfr_t)
-@@ -315,6 +328,8 @@
- corenet_udp_sendrecv_all_ports(ypxfr_t)
- corenet_tcp_bind_generic_node(ypxfr_t)
- corenet_udp_bind_generic_node(ypxfr_t)
-+corenet_tcp_bind_reserved_port(ypxfr_t)
-+corenet_udp_bind_reserved_port(ypxfr_t)
- corenet_tcp_bind_all_rpc_ports(ypxfr_t)
- corenet_udp_bind_all_rpc_ports(ypxfr_t)
- corenet_dontaudit_tcp_bind_all_reserved_ports(ypxfr_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-3.7.15/policy/modules/services/nscd.if
---- nsaserefpolicy/policy/modules/services/nscd.if 2009-09-16 09:09:20.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/nscd.if 2010-03-18 10:44:43.000000000 -0400
-@@ -121,6 +121,24 @@
-
- ########################################
- ##
-+## Use nscd services
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`nscd_use',`
-+ tunable_policy(`nscd_use_shm',`
-+ nscd_shm_use($1)
-+ ',`
-+ nscd_socket_use($1)
-+ ')
-+')
-+
-+########################################
-+##
- ## Use NSCD services by mapping the database from
- ## an inherited NSCD file descriptor.
- ##
-@@ -168,7 +186,7 @@
- type nscd_var_run_t;
- ')
-
-- dontaudit $1 nscd_var_run_t:dir search;
-+ dontaudit $1 nscd_var_run_t:dir search_dir_perms;
- ')
-
- ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.te serefpolicy-3.7.15/policy/modules/services/nscd.te
---- nsaserefpolicy/policy/modules/services/nscd.te 2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/nscd.te 2010-03-18 10:44:43.000000000 -0400
-@@ -1,10 +1,17 @@
-
--policy_module(nscd, 1.10.0)
-+policy_module(nscd, 1.10.1)
-
- gen_require(`
- class nscd all_nscd_perms;
- ')
-
-+##
-+##
-+## Allow confined applications to use nscd shared memory.
-+##
-+##
-+gen_tunable(nscd_use_shm, false)
-+
- ########################################
- #
- # Declarations
-@@ -91,6 +98,7 @@
- selinux_compute_relabel_context(nscd_t)
- selinux_compute_user_contexts(nscd_t)
- domain_use_interactive_fds(nscd_t)
-+domain_search_all_domains_state(nscd_t)
-
- files_read_etc_files(nscd_t)
- files_read_generic_tmp_symlinks(nscd_t)
-@@ -128,3 +136,16 @@
- xen_dontaudit_rw_unix_stream_sockets(nscd_t)
- xen_append_log(nscd_t)
- ')
-+
-+optional_policy(`
-+ tunable_policy(`samba_domain_controller',`
-+ samba_append_log(nscd_t)
-+ samba_dontaudit_use_fds(nscd_t)
-+ ')
-+ samba_read_config(nscd_t)
-+ samba_read_var_files(nscd_t)
-+')
-+
-+optional_policy(`
-+ unconfined_dontaudit_rw_packet_sockets(nscd_t)
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntop.fc serefpolicy-3.7.15/policy/modules/services/ntop.fc
---- nsaserefpolicy/policy/modules/services/ntop.fc 2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/ntop.fc 2010-03-18 10:44:43.000000000 -0400
-@@ -1,7 +1,6 @@
- /etc/ntop(/.*)? gen_context(system_u:object_r:ntop_etc_t,s0)
-
- /usr/bin/ntop -- gen_context(system_u:object_r:ntop_exec_t,s0)
--/usr/share/ntop/html(/.*)? gen_context(system_u:object_r:ntop_http_content_t,s0)
-
- /var/lib/ntop(/.*)? gen_context(system_u:object_r:ntop_var_lib_t,s0)
- /var/run/ntop\.pid -- gen_context(system_u:object_r:ntop_var_run_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntop.te serefpolicy-3.7.15/policy/modules/services/ntop.te
---- nsaserefpolicy/policy/modules/services/ntop.te 2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/ntop.te 2010-03-18 10:44:43.000000000 -0400
-@@ -11,12 +11,12 @@
- init_daemon_domain(ntop_t, ntop_exec_t)
- application_domain(ntop_t, ntop_exec_t)
-
-+type ntop_initrc_exec_t;
-+init_script_file(ntop_initrc_exec_t)
-+
- type ntop_etc_t;
- files_config_file(ntop_etc_t)
-
--type ntop_http_content_t;
--files_type(ntop_http_content_t)
--
- type ntop_tmp_t;
- files_tmp_file(ntop_tmp_t)
-
-@@ -37,26 +37,28 @@
- allow ntop_t self:fifo_file rw_fifo_file_perms;
- allow ntop_t self:tcp_socket create_stream_socket_perms;
- allow ntop_t self:udp_socket create_socket_perms;
-+allow ntop_t self:unix_dgram_socket create_socket_perms;
-+allow ntop_t self:unix_stream_socket create_stream_socket_perms;
- allow ntop_t self:packet_socket create_socket_perms;
-+allow ntop_t self:socket create_socket_perms;
-
- allow ntop_t ntop_etc_t:dir list_dir_perms;
- read_files_pattern(ntop_t, ntop_etc_t, ntop_etc_t)
- read_lnk_files_pattern(ntop_t, ntop_etc_t, ntop_etc_t)
-
--allow ntop_t ntop_http_content_t:dir list_dir_perms;
--read_files_pattern(ntop_t, ntop_http_content_t, ntop_http_content_t)
--
- manage_dirs_pattern(ntop_t, ntop_tmp_t, ntop_tmp_t)
- manage_files_pattern(ntop_t, ntop_tmp_t, ntop_tmp_t)
- files_tmp_filetrans(ntop_t, ntop_tmp_t, { file dir })
-
--create_dirs_pattern(ntop_t, ntop_var_lib_t, ntop_var_lib_t)
--manage_files_pattern(ntop_t, ntop_var_lib_t, ntop_var_lib_t)
--files_var_lib_filetrans(ntop_t, ntop_var_lib_t, file)
-+manage_dirs_pattern(ntop_t, ntop_var_lib_t, ntop_var_lib_t)
-+manage_files_pattern(ntop_t, ntop_var_lib_t, ntop_var_lib_t)
-+files_var_lib_filetrans(ntop_t, ntop_var_lib_t, { file dir } )
-
- manage_files_pattern(ntop_t, ntop_var_run_t, ntop_var_run_t)
- files_pid_filetrans(ntop_t, ntop_var_run_t, file)
-
-+kernel_request_load_module(ntop_t)
-+kernel_read_system_state(ntop_t)
- kernel_read_network_state(ntop_t)
- kernel_read_kernel_sysctls(ntop_t)
- kernel_list_proc(ntop_t)
-@@ -72,26 +74,36 @@
- corenet_raw_sendrecv_generic_node(ntop_t)
- corenet_tcp_sendrecv_all_ports(ntop_t)
- corenet_udp_sendrecv_all_ports(ntop_t)
-+corenet_tcp_bind_ntop_port(ntop_t)
-+corenet_tcp_connect_ntop_port(ntop_t)
-+corenet_tcp_connect_http_port(ntop_t)
-
- dev_read_sysfs(ntop_t)
-+dev_rw_generic_usb_dev(ntop_t)
-
- domain_use_interactive_fds(ntop_t)
-
- files_read_etc_files(ntop_t)
-+files_read_usr_files(ntop_t)
-
- fs_getattr_all_fs(ntop_t)
- fs_search_auto_mountpoints(ntop_t)
-
-+auth_use_nsswitch(ntop_t)
-+
- logging_send_syslog_msg(ntop_t)
-
- miscfiles_read_localization(ntop_t)
--
--sysnet_read_config(ntop_t)
-+miscfiles_read_fonts(ntop_t)
-
- userdom_dontaudit_use_unpriv_user_fds(ntop_t)
- userdom_dontaudit_search_user_home_dirs(ntop_t)
-
- optional_policy(`
-+ apache_read_sys_content(ntop_t)
-+')
-+
-+optional_policy(`
- seutil_sigchld_newrole(ntop_t)
- ')
-
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-3.7.15/policy/modules/services/ntp.te
---- nsaserefpolicy/policy/modules/services/ntp.te 2010-01-07 14:53:53.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/ntp.te 2010-03-18 10:44:43.000000000 -0400
-@@ -100,6 +100,8 @@
-
- fs_getattr_all_fs(ntpd_t)
- fs_search_auto_mountpoints(ntpd_t)
-+# Necessary to communicate with gpsd devices
-+fs_rw_tmpfs_files(ntpd_t)
-
- term_use_ptmx(ntpd_t)
-
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nut.te serefpolicy-3.7.15/policy/modules/services/nut.te
---- nsaserefpolicy/policy/modules/services/nut.te 2010-02-12 10:33:09.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/nut.te 2010-03-18 10:44:43.000000000 -0400
-@@ -29,7 +29,8 @@
- # Local policy for upsd
- #
-
--allow nut_upsd_t self:capability { setgid setuid };
-+allow nut_upsd_t self:capability { setgid setuid dac_override };
-+
- allow nut_upsd_t self:unix_dgram_socket { create_socket_perms sendto };
- allow nut_upsd_t self:tcp_socket connected_stream_socket_perms;
-
-@@ -86,6 +87,7 @@
- # Creates /etc/killpower
- files_manage_etc_runtime_files(nut_upsmon_t)
- files_etc_filetrans_etc_runtime(nut_upsmon_t, file)
-+files_search_usr(nut_upsmon_t)
-
- # /usr/bin/wall
- term_write_all_terms(nut_upsmon_t)
-@@ -100,6 +102,12 @@
-
- miscfiles_read_localization(nut_upsmon_t)
-
-+mta_send_mail(nut_upsmon_t)
-+
-+optional_policy(`
-+ shutdown_domtrans(nut_upsmon_t)
-+')
-+
- ########################################
- #
- # Local policy for upsdrvctl
-@@ -123,6 +131,7 @@
- kernel_read_kernel_sysctls(nut_upsdrvctl_t)
-
- # /sbin/upsdrvctl executes other drivers
-+# can_exec(nut_upsdrvctl_t, nut_upsdrvctl_exec_t)
- corecmd_exec_bin(nut_upsdrvctl_t)
-
- dev_read_urand(nut_upsdrvctl_t)
-@@ -149,5 +158,15 @@
-
- read_files_pattern(httpd_nutups_cgi_script_t, nut_conf_t, nut_conf_t)
-
-+ corenet_all_recvfrom_unlabeled(httpd_nutups_cgi_script_t)
-+ corenet_all_recvfrom_netlabel(httpd_nutups_cgi_script_t)
-+ corenet_tcp_sendrecv_generic_if(httpd_nutups_cgi_script_t)
-+ corenet_tcp_sendrecv_generic_node(httpd_nutups_cgi_script_t)
-+ corenet_tcp_sendrecv_all_ports(httpd_nutups_cgi_script_t)
- corenet_tcp_connect_ups_port(httpd_nutups_cgi_script_t)
-+ corenet_udp_sendrecv_generic_if(httpd_nutups_cgi_script_t)
-+ corenet_udp_sendrecv_generic_node(httpd_nutups_cgi_script_t)
-+ corenet_udp_sendrecv_all_ports(httpd_nutups_cgi_script_t)
-+
-+ sysnet_dns_name_resolve(httpd_nutups_cgi_script_t)
- ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nx.fc serefpolicy-3.7.15/policy/modules/services/nx.fc
---- nsaserefpolicy/policy/modules/services/nx.fc 2010-02-12 10:33:09.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/nx.fc 2010-03-18 10:44:43.000000000 -0400
-@@ -1,7 +1,15 @@
- /opt/NX/bin/nxserver -- gen_context(system_u:object_r:nx_server_exec_t,s0)
-
--/opt/NX/home/nx/\.ssh(/.*)? gen_context(system_u:object_r:nx_server_ssh_home_t,s0)
--
-+/opt/NX/home(/.*)? gen_context(system_u:object_r:nx_server_var_lib_t,s0)
-+/opt/NX/home/nx/\.ssh(/.*)? gen_context(system_u:object_r:nx_server_home_ssh_t,s0)
- /opt/NX/var(/.*)? gen_context(system_u:object_r:nx_server_var_run_t,s0)
-
-+/usr/NX/bin/nxserver -- gen_context(system_u:object_r:nx_server_exec_t,s0)
-+
-+/usr/NX/home(/.*)? gen_context(system_u:object_r:nx_server_var_lib_t,s0)
-+/usr/NX/home/nx/\.ssh(/.*)? gen_context(system_u:object_r:nx_server_home_ssh_t,s0)
-+
-+/var/lib/nxserver/home/.ssh(/.*)? gen_context(system_u:object_r:nx_server_home_ssh_t,s0)
-+/var/lib/nxserver(/.*)? gen_context(system_u:object_r:nx_server_var_lib_t,s0)
-+
- /usr/libexec/nx/nxserver -- gen_context(system_u:object_r:nx_server_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nx.if serefpolicy-3.7.15/policy/modules/services/nx.if
---- nsaserefpolicy/policy/modules/services/nx.if 2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/nx.if 2010-03-18 10:44:43.000000000 -0400
-@@ -17,3 +17,70 @@
-
- spec_domtrans_pattern($1, nx_server_exec_t, nx_server_t)
- ')
-+
-+########################################
-+##
-+## Read nx home directory content
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`nx_read_home_files',`
-+ gen_require(`
-+ type nx_server_home_ssh_t, nx_server_var_lib_t;
-+ ')
-+
-+ allow $1 nx_server_var_lib_t:dir search_dir_perms;
-+ read_files_pattern($1, nx_server_home_ssh_t, nx_server_home_ssh_t)
-+ read_lnk_files_pattern($1, nx_server_home_ssh_t, nx_server_home_ssh_t)
-+')
-+
-+########################################
-+##
-+## Read nx home directory content
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`nx_search_var_lib',`
-+ gen_require(`
-+ type nx_server_var_lib_t;
-+ ')
-+
-+ allow $1 nx_server_var_lib_t:dir search_dir_perms;
-+')
-+
-+########################################
-+##
-+## Create an object in the root directory, with a private
-+## type using a type transition.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+##
-+##
-+## The type of the object to be created.
-+##
-+##
-+##
-+##
-+## The object class of the object being created.
-+##
-+##
-+#
-+interface(`nx_var_lib_filetrans',`
-+ gen_require(`
-+ type nx_server_var_lib_t;
-+ ')
-+
-+ filetrans_pattern($1, nx_server_var_lib_t, $2, $3)
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nx.te serefpolicy-3.7.15/policy/modules/services/nx.te
---- nsaserefpolicy/policy/modules/services/nx.te 2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/nx.te 2010-03-18 10:44:43.000000000 -0400
-@@ -25,6 +25,12 @@
- type nx_server_var_run_t;
- files_pid_file(nx_server_var_run_t)
-
-+type nx_server_var_lib_t;
-+files_type(nx_server_var_lib_t)
-+
-+type nx_server_home_ssh_t;
-+files_type(nx_server_home_ssh_t)
-+
- ########################################
- #
- # NX server local policy
-@@ -37,6 +43,10 @@
- allow nx_server_t nx_server_devpts_t:chr_file { rw_chr_file_perms setattr };
- term_create_pty(nx_server_t, nx_server_devpts_t)
-
-+manage_files_pattern(nx_server_t, nx_server_var_lib_t,nx_server_var_lib_t)
-+manage_dirs_pattern(nx_server_t, nx_server_var_lib_t,nx_server_var_lib_t)
-+files_var_lib_filetrans(nx_server_t,nx_server_var_lib_t, { file dir })
-+
- manage_dirs_pattern(nx_server_t, nx_server_tmp_t, nx_server_tmp_t)
- manage_files_pattern(nx_server_t, nx_server_tmp_t, nx_server_tmp_t)
- files_tmp_filetrans(nx_server_t, nx_server_tmp_t, { file dir })
-@@ -44,6 +54,9 @@
- manage_files_pattern(nx_server_t, nx_server_var_run_t, nx_server_var_run_t)
- files_pid_filetrans(nx_server_t, nx_server_var_run_t, file)
-
-+manage_dirs_pattern(nx_server_t, nx_server_home_ssh_t, nx_server_home_ssh_t)
-+manage_files_pattern(nx_server_t, nx_server_home_ssh_t, nx_server_home_ssh_t)
-+
- kernel_read_system_state(nx_server_t)
- kernel_read_kernel_sysctls(nx_server_t)
-
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.if serefpolicy-3.7.15/policy/modules/services/oddjob.if
---- nsaserefpolicy/policy/modules/services/oddjob.if 2009-07-28 13:28:33.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/oddjob.if 2010-03-18 10:44:43.000000000 -0400
-@@ -44,6 +44,7 @@
- ')
-
- domtrans_pattern(oddjob_t, $2, $1)
-+ domain_user_exemption_target($1)
- ')
-
- ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.te serefpolicy-3.7.15/policy/modules/services/oddjob.te
---- nsaserefpolicy/policy/modules/services/oddjob.te 2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/oddjob.te 2010-03-18 10:44:43.000000000 -0400
-@@ -100,8 +100,7 @@
-
- # Add/remove user home directories
- userdom_home_filetrans_user_home_dir(oddjob_mkhomedir_t)
--userdom_manage_user_home_content_dirs(oddjob_mkhomedir_t)
--userdom_manage_user_home_content_files(oddjob_mkhomedir_t)
- userdom_manage_user_home_dirs(oddjob_mkhomedir_t)
--userdom_user_home_dir_filetrans_user_home_content(oddjob_mkhomedir_t, notdevfile_class_set)
-+userdom_manage_user_home_content_dirs(oddjob_mkhomedir_t)
-+userdom_manage_user_home_content(oddjob_mkhomedir_t)
-
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-3.7.15/policy/modules/services/openvpn.te
---- nsaserefpolicy/policy/modules/services/openvpn.te 2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/openvpn.te 2010-03-18 10:44:43.000000000 -0400
-@@ -41,7 +41,7 @@
- # openvpn local policy
- #
-
--allow openvpn_t self:capability { dac_read_search dac_override net_bind_service net_admin setgid setuid sys_chroot sys_tty_config };
-+allow openvpn_t self:capability { dac_read_search dac_override ipc_lock net_bind_service net_admin setgid setuid sys_chroot sys_tty_config };
- allow openvpn_t self:process { signal getsched };
- allow openvpn_t self:fifo_file rw_fifo_file_perms;
-
-@@ -85,6 +85,7 @@
- corenet_udp_bind_generic_node(openvpn_t)
- corenet_tcp_bind_openvpn_port(openvpn_t)
- corenet_udp_bind_openvpn_port(openvpn_t)
-+corenet_tcp_bind_http_port(openvpn_t)
- corenet_tcp_connect_openvpn_port(openvpn_t)
- corenet_tcp_connect_http_port(openvpn_t)
- corenet_tcp_connect_http_cache_port(openvpn_t)
-@@ -100,6 +101,8 @@
- files_read_etc_files(openvpn_t)
- files_read_etc_runtime_files(openvpn_t)
-
-+auth_use_pam(openvpn_t)
-+
- logging_send_syslog_msg(openvpn_t)
-
- miscfiles_read_localization(openvpn_t)
-@@ -107,7 +110,7 @@
-
- sysnet_dns_name_resolve(openvpn_t)
- sysnet_exec_ifconfig(openvpn_t)
--sysnet_write_config(openvpn_t)
-+sysnet_manage_config(openvpn_t)
- sysnet_etc_filetrans_config(openvpn_t)
-
- userdom_use_user_terminals(openvpn_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pcscd.if serefpolicy-3.7.15/policy/modules/services/pcscd.if
---- nsaserefpolicy/policy/modules/services/pcscd.if 2009-12-18 11:38:25.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/pcscd.if 2010-03-18 10:44:43.000000000 -0400
-@@ -39,6 +39,44 @@
-
- ########################################
- ##
-+## Manage pcscd pub files.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`pcscd_manage_pub_files',`
-+ gen_require(`
-+ type pcscd_var_run_t;
-+ ')
-+
-+ files_search_pids($1)
-+ manage_files_pattern($1, pcscd_var_run_t, pcscd_var_run_t)
-+')
-+
-+########################################
-+##
-+## Manage pcscd pub fifo files.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`pcscd_manage_pub_pipes',`
-+ gen_require(`
-+ type pcscd_var_run_t;
-+ ')
-+
-+ files_search_pids($1)
-+ manage_fifo_files_pattern($1, pcscd_var_run_t, pcscd_var_run_t)
-+')
-+
-+########################################
-+##
- ## Connect to pcscd over an unix stream socket.
- ##
- ##
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-3.7.15/policy/modules/services/pegasus.te
---- nsaserefpolicy/policy/modules/services/pegasus.te 2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/pegasus.te 2010-03-18 10:44:43.000000000 -0400
-@@ -30,7 +30,7 @@
- # Local policy
- #
-
--allow pegasus_t self:capability { chown sys_nice setuid setgid dac_override net_bind_service };
-+allow pegasus_t self:capability { chown ipc_lock sys_nice setuid setgid dac_override net_bind_service };
- dontaudit pegasus_t self:capability sys_tty_config;
- allow pegasus_t self:process signal;
- allow pegasus_t self:fifo_file rw_fifo_file_perms;
-@@ -66,6 +66,8 @@
- kernel_read_system_state(pegasus_t)
- kernel_search_vm_sysctl(pegasus_t)
- kernel_read_net_sysctls(pegasus_t)
-+kernel_read_xen_state(pegasus_t)
-+kernel_write_xen_state(pegasus_t)
-
- corenet_all_recvfrom_unlabeled(pegasus_t)
- corenet_all_recvfrom_netlabel(pegasus_t)
-@@ -96,13 +98,12 @@
-
- auth_use_nsswitch(pegasus_t)
- auth_domtrans_chk_passwd(pegasus_t)
-+auth_read_shadow(pegasus_t)
-
- domain_use_interactive_fds(pegasus_t)
- domain_read_all_domains_state(pegasus_t)
-
--files_read_etc_files(pegasus_t)
--files_list_var_lib(pegasus_t)
--files_read_var_lib_files(pegasus_t)
-+files_read_all_files(pegasus_t)
- files_read_var_lib_symlinks(pegasus_t)
-
- hostname_exec(pegasus_t)
-@@ -115,7 +116,6 @@
-
- miscfiles_read_localization(pegasus_t)
-
--sysnet_read_config(pegasus_t)
- sysnet_domtrans_ifconfig(pegasus_t)
-
- userdom_dontaudit_use_unpriv_user_fds(pegasus_t)
-@@ -126,6 +126,14 @@
- ')
-
- optional_policy(`
-+ samba_manage_config(pegasus_t)
-+')
-+
-+optional_policy(`
-+ ssh_exec(pegasus_t)
-+')
-+
-+optional_policy(`
- seutil_sigchld_newrole(pegasus_t)
- seutil_dontaudit_read_config(pegasus_t)
- ')
-@@ -137,3 +145,13 @@
- optional_policy(`
- unconfined_signull(pegasus_t)
- ')
-+
-+optional_policy(`
-+ virt_domtrans(pegasus_t)
-+ virt_manage_config(pegasus_t)
-+')
-+
-+optional_policy(`
-+ xen_stream_connect(pegasus_t)
-+ xen_stream_connect_xenstore(pegasus_t)
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/plymouthd.fc serefpolicy-3.7.15/policy/modules/services/plymouthd.fc
---- nsaserefpolicy/policy/modules/services/plymouthd.fc 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/plymouthd.fc 2010-03-18 10:44:43.000000000 -0400
-@@ -0,0 +1,9 @@
-+/bin/plymouth -- gen_context(system_u:object_r:plymouth_exec_t, s0)
-+
-+/sbin/plymouthd -- gen_context(system_u:object_r:plymouthd_exec_t, s0)
-+
-+/var/spool/plymouth(/.*)? gen_context(system_u:object_r:plymouthd_spool_t, s0)
-+
-+/var/lib/plymouth(/.*)? gen_context(system_u:object_r:plymouthd_var_lib_t, s0)
-+
-+/var/run/plymouth(/.*)? gen_context(system_u:object_r:plymouthd_var_run_t, s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/plymouthd.if serefpolicy-3.7.15/policy/modules/services/plymouthd.if
---- nsaserefpolicy/policy/modules/services/plymouthd.if 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/plymouthd.if 2010-03-18 10:44:43.000000000 -0400
-@@ -0,0 +1,322 @@
-+## policy for plymouthd
-+
-+########################################
-+##
-+## Execute a domain transition to run plymouthd.
-+##
-+##
-+##
-+## Domain allowed to transition.
-+##
-+##
-+#
-+interface(`plymouthd_domtrans', `
-+ gen_require(`
-+ type plymouthd_t, plymouthd_exec_t;
-+ ')
-+
-+ domtrans_pattern($1, plymouthd_exec_t, plymouthd_t)
-+')
-+
-+########################################
-+##
-+## Execute the plymoth daemon in the current domain
-+##
-+##
-+##
-+## Domain allowed to transition.
-+##
-+##
-+#
-+interface(`plymouthd_exec', `
-+ gen_require(`
-+ type plymouthd_exec_t;
-+ ')
-+
-+ can_exec($1, plymouthd_exec_t)
-+')
-+
-+########################################
-+##
-+## Execute the plymoth command in the current domain
-+##
-+##
-+##
-+## Domain allowed to transition.
-+##
-+##
-+#
-+interface(`plymouthd_exec_plymouth', `
-+ gen_require(`
-+ type plymouth_exec_t;
-+ ')
-+
-+ can_exec($1, plymouth_exec_t)
-+')
-+
-+########################################
-+##
-+## Execute a domain transition to run plymouthd.
-+##
-+##
-+##
-+## Domain allowed to transition.
-+##
-+##
-+#
-+interface(`plymouthd_domtrans_plymouth', `
-+ gen_require(`
-+ type plymouth_t, plymouth_exec_t;
-+ ')
-+
-+ domtrans_pattern($1, plymouth_exec_t, plymouth_t)
-+')
-+
-+
-+########################################
-+##
-+## Read plymouthd PID files.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`plymouthd_read_pid_files', `
-+ gen_require(`
-+ type plymouthd_var_run_t;
-+ ')
-+
-+ files_search_pids($1)
-+ allow $1 plymouthd_var_run_t:file read_file_perms;
-+')
-+
-+########################################
-+##
-+## Manage plymouthd var_run files.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`plymouthd_manage_var_run', `
-+ gen_require(`
-+ type plymouthd_var_run_t;
-+ ')
-+
-+ manage_dirs_pattern($1, plymouthd_var_run_t, plymouthd_var_run_t)
-+ manage_files_pattern($1, plymouthd_var_run_t, plymouthd_var_run_t)
-+ manage_lnk_files_pattern($1, plymouthd_var_run_t, plymouthd_var_run_t)
-+')
-+
-+
-+########################################
-+##
-+## Search plymouthd lib directories.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`plymouthd_search_lib', `
-+ gen_require(`
-+ type plymouthd_var_lib_t;
-+ ')
-+
-+ allow $1 plymouthd_var_lib_t:dir search_dir_perms;
-+ files_search_var_lib($1)
-+')
-+
-+########################################
-+##
-+## Read plymouthd lib files.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`plymouthd_read_lib_files', `
-+ gen_require(`
-+ type plymouthd_var_lib_t;
-+ ')
-+
-+ files_search_var_lib($1)
-+ read_files_pattern($1, plymouthd_var_lib_t, plymouthd_var_lib_t)
-+')
-+
-+########################################
-+##
-+## Create, read, write, and delete
-+## plymouthd lib files.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`plymouthd_manage_lib_files', `
-+ gen_require(`
-+ type plymouthd_var_lib_t;
-+ ')
-+
-+ files_search_var_lib($1)
-+ manage_files_pattern($1, plymouthd_var_lib_t, plymouthd_var_lib_t)
-+')
-+
-+########################################
-+##
-+## Manage plymouthd var_lib files.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`plymouthd_manage_var_lib', `
-+ gen_require(`
-+ type plymouthd_var_lib_t;
-+ ')
-+
-+ manage_dirs_pattern($1, plymouthd_var_lib_t, plymouthd_var_lib_t)
-+ manage_files_pattern($1, plymouthd_var_lib_t, plymouthd_var_lib_t)
-+ manage_lnk_files_pattern($1, plymouthd_var_lib_t, plymouthd_var_lib_t)
-+')
-+
-+
-+########################################
-+##
-+## Search plymouthd spool directories.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`plymouthd_search_spool', `
-+ gen_require(`
-+ type plymouthd_spool_t;
-+ ')
-+
-+ allow $1 plymouthd_spool_t:dir search_dir_perms;
-+ files_search_spool($1)
-+')
-+
-+########################################
-+##
-+## Read plymouthd spool files.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`plymouthd_read_spool_files', `
-+ gen_require(`
-+ type plymouthd_spool_t;
-+ ')
-+
-+ files_search_spool($1)
-+ read_files_pattern($1, plymouthd_spool_t, plymouthd_spool_t)
-+')
-+
-+########################################
-+##
-+## Create, read, write, and delete
-+## plymouthd spool files.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`plymouthd_manage_spool_files', `
-+ gen_require(`
-+ type plymouthd_spool_t;
-+ ')
-+
-+ files_search_spool($1)
-+ manage_files_pattern($1, plymouthd_spool_t, plymouthd_spool_t)
-+')
-+
-+########################################
-+##
-+## Allow domain to manage plymouthd spool files
-+##
-+##
-+##
-+## Domain allowed access
-+##
-+##
-+#
-+interface(`plymouthd_manage_spool', `
-+ gen_require(`
-+ type plymouthd_spool_t;
-+ ')
-+
-+ manage_dirs_pattern($1, plymouthd_spool_t, plymouthd_spool_t)
-+ manage_files_pattern($1, plymouthd_spool_t, plymouthd_spool_t)
-+ manage_lnk_files_pattern($1, plymouthd_spool_t, plymouthd_spool_t)
-+')
-+
-+########################################
-+##
-+## All of the rules required to administrate
-+## an plymouthd environment
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+##
-+##
-+## Role allowed access.
-+##
-+##
-+##
-+#
-+interface(`plymouthd_admin', `
-+ gen_require(`
-+ type plymouthd_t;
-+ ')
-+
-+ allow $1 plymouthd_t:process { ptrace signal_perms getattr };
-+ read_files_pattern($1, plymouthd_t, plymouthd_t)
-+
-+ plymouthd_manage_var_run($1)
-+
-+ plymouthd_manage_var_lib($1)
-+
-+ plymouthd_manage_spool($1)
-+')
-+
-+########################################
-+##
-+## Allow domain to Stream socket connect
-+## to Plymouth daemon.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`plymouthd_stream_connect', `
-+ gen_require(`
-+ type plymouthd_t;
-+ ')
-+
-+ allow $1 plymouthd_t:unix_stream_socket connectto;
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/plymouthd.te serefpolicy-3.7.15/policy/modules/services/plymouthd.te
---- nsaserefpolicy/policy/modules/services/plymouthd.te 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/plymouthd.te 2010-03-18 10:44:43.000000000 -0400
-@@ -0,0 +1,105 @@
-+policy_module(plymouthd, 1.0.0)
-+
-+########################################
-+#
-+# Plymouthd private declarations
-+#
-+
-+type plymouthd_t;
-+type plymouthd_exec_t;
-+init_daemon_domain(plymouthd_t, plymouthd_exec_t)
-+
-+type plymouthd_var_run_t;
-+files_pid_file(plymouthd_var_run_t)
-+
-+type plymouthd_var_lib_t;
-+files_type(plymouthd_var_lib_t)
-+
-+type plymouthd_spool_t;
-+files_type(plymouthd_spool_t)
-+
-+########################################
-+#
-+# Plymouth private declarations
-+#
-+
-+type plymouth_t;
-+type plymouth_exec_t;
-+application_domain(plymouth_t, plymouth_exec_t)
-+
-+########################################
-+#
-+# Plymouthd private policy
-+#
-+
-+allow plymouthd_t self:capability { sys_admin sys_tty_config };
-+dontaudit plymouthd_t self:capability dac_override;
-+allow plymouthd_t self:process signal;
-+allow plymouthd_t self:fifo_file rw_fifo_file_perms;
-+allow plymouthd_t self:unix_stream_socket create_stream_socket_perms;
-+
-+kernel_read_system_state(plymouthd_t)
-+kernel_request_load_module(plymouthd_t)
-+kernel_change_ring_buffer_level(plymouthd_t)
-+
-+dev_rw_dri(plymouthd_t)
-+dev_read_sysfs(plymouthd_t)
-+dev_read_framebuffer(plymouthd_t)
-+dev_write_framebuffer(plymouthd_t)
-+
-+domain_use_interactive_fds(plymouthd_t)
-+
-+files_read_etc_files(plymouthd_t)
-+files_read_usr_files(plymouthd_t)
-+
-+miscfiles_read_localization(plymouthd_t)
-+miscfiles_read_fonts(plymouthd_t)
-+miscfiles_manage_fonts_cache(plymouthd_t)
-+
-+manage_dirs_pattern(plymouthd_t, plymouthd_var_run_t, plymouthd_var_run_t)
-+manage_files_pattern(plymouthd_t, plymouthd_var_run_t, plymouthd_var_run_t)
-+files_pid_filetrans(plymouthd_t,plymouthd_var_run_t, { file dir })
-+
-+manage_dirs_pattern(plymouthd_t, plymouthd_var_lib_t, plymouthd_var_lib_t)
-+manage_files_pattern(plymouthd_t, plymouthd_var_lib_t, plymouthd_var_lib_t)
-+files_var_lib_filetrans(plymouthd_t, plymouthd_var_lib_t, { file dir })
-+
-+manage_dirs_pattern(plymouthd_t, plymouthd_spool_t, plymouthd_spool_t)
-+manage_files_pattern(plymouthd_t, plymouthd_spool_t, plymouthd_spool_t)
-+manage_sock_files_pattern(plymouthd_t, plymouthd_spool_t, plymouthd_spool_t)
-+files_spool_filetrans(plymouthd_t,plymouthd_spool_t, { file dir sock_file })
-+
-+########################################
-+#
-+# Plymouth private policy
-+#
-+
-+allow plymouth_t self:process { signal };
-+allow plymouth_t self:fifo_file rw_file_perms;
-+allow plymouth_t self:unix_stream_socket create_stream_socket_perms;
-+
-+kernel_read_system_state(plymouth_t)
-+kernel_stream_connect(plymouth_t)
-+
-+domain_use_interactive_fds(plymouth_t)
-+
-+files_read_etc_files(plymouth_t)
-+
-+miscfiles_read_localization(plymouth_t)
-+
-+sysnet_read_config(plymouth_t)
-+
-+term_use_ptmx(plymouth_t)
-+
-+plymouthd_stream_connect(plymouth_t)
-+
-+optional_policy(`
-+ lvm_domtrans(plymouth_t)
-+')
-+
-+ifdef(`hide_broken_symptoms', `
-+optional_policy(`
-+ hal_dontaudit_write_log(plymouth_t)
-+ hal_dontaudit_rw_pipes(plymouth_t)
-+')
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/policykit.fc serefpolicy-3.7.15/policy/modules/services/policykit.fc
---- nsaserefpolicy/policy/modules/services/policykit.fc 2009-08-18 11:41:14.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/policykit.fc 2010-03-18 10:44:43.000000000 -0400
-@@ -6,10 +6,13 @@
- /usr/libexec/polkit-read-auth-helper -- gen_context(system_u:object_r:policykit_auth_exec_t,s0)
- /usr/libexec/polkit-grant-helper.* -- gen_context(system_u:object_r:policykit_grant_exec_t,s0)
- /usr/libexec/polkit-resolve-exe-helper.* -- gen_context(system_u:object_r:policykit_resolve_exec_t,s0)
--/usr/libexec/polkitd -- gen_context(system_u:object_r:policykit_exec_t,s0)
-+/usr/libexec/polkitd.* -- gen_context(system_u:object_r:policykit_exec_t,s0)
-+/usr/libexec/polkit-1/polkit-agent-helper-1 -- gen_context(system_u:object_r:policykit_auth_exec_t,s0)
-+/usr/libexec/polkit-1/polkitd.* -- gen_context(system_u:object_r:policykit_exec_t,s0)
-
- /var/lib/misc/PolicyKit.reload gen_context(system_u:object_r:policykit_reload_t,s0)
- /var/lib/PolicyKit(/.*)? gen_context(system_u:object_r:policykit_var_lib_t,s0)
-+/var/lib/polkit-1(/.*)? gen_context(system_u:object_r:policykit_var_lib_t,s0)
- /var/lib/PolicyKit-public(/.*)? gen_context(system_u:object_r:policykit_var_lib_t,s0)
- /var/run/PolicyKit(/.*)? gen_context(system_u:object_r:policykit_var_run_t,s0)
-
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/policykit.if serefpolicy-3.7.15/policy/modules/services/policykit.if
---- nsaserefpolicy/policy/modules/services/policykit.if 2009-08-18 18:39:50.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/policykit.if 2010-03-18 10:44:43.000000000 -0400
-@@ -17,12 +17,37 @@
- class dbus send_msg;
- ')
-
-+ ps_process_pattern(policykit_t, $1)
-+
- allow $1 policykit_t:dbus send_msg;
- allow policykit_t $1:dbus send_msg;
- ')
-
- ########################################
- ##
-+## Send and receive messages from
-+## policykit over dbus.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`policykit_dbus_chat_auth',`
-+ gen_require(`
-+ type policykit_auth_t;
-+ class dbus send_msg;
-+ ')
-+
-+ ps_process_pattern(policykit_auth_t, $1)
-+
-+ allow $1 policykit_auth_t:dbus send_msg;
-+ allow policykit_auth_t $1:dbus send_msg;
-+')
-+
-+########################################
-+##
- ## Execute a domain transition to run polkit_auth.
- ##
- ##
-@@ -62,6 +87,9 @@
-
- policykit_domtrans_auth($1)
- role $2 types policykit_auth_t;
-+
-+ allow $1 policykit_auth_t:process signal;
-+ ps_process_pattern(policykit_auth_t, $1)
- ')
-
- ########################################
-@@ -206,4 +234,47 @@
-
- files_search_var_lib($1)
- read_files_pattern($1, policykit_var_lib_t, policykit_var_lib_t)
-+
-+ # Broken placement
-+ cron_read_system_job_lib_files($1)
-+')
-+
-+#######################################
-+##
-+## The per role template for the policykit module.
-+##
-+##
-+##
-+## Role allowed access
-+##
-+##
-+##
-+##
-+## User domain for the role
-+##
-+##
-+#
-+template(`policykit_role',`
-+ policykit_run_auth($2, $1)
-+ policykit_run_grant($2, $1)
-+ policykit_read_lib($2)
-+ policykit_read_reload($2)
-+ policykit_dbus_chat($2)
-+')
-+########################################
-+##
-+## Send generic signal to policy_auth
-+##
-+##
-+##
-+## Domain allowed to transition.
-+##
-+##
-+#
-+interface(`policykit_signal_auth',`
-+ gen_require(`
-+ type policykit_auth_t;
-+ ')
-+
-+ allow $1 policykit_auth_t:process signal;
- ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/policykit.te serefpolicy-3.7.15/policy/modules/services/policykit.te
---- nsaserefpolicy/policy/modules/services/policykit.te 2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/policykit.te 2010-03-18 10:44:43.000000000 -0400
-@@ -36,11 +36,12 @@
- # policykit local policy
- #
-
--allow policykit_t self:capability { setgid setuid };
--allow policykit_t self:process getattr;
--allow policykit_t self:fifo_file rw_file_perms;
-+allow policykit_t self:capability { dac_override dac_read_search setgid setuid sys_ptrace };
-+allow policykit_t self:process { getsched getattr signal };
-+allow policykit_t self:fifo_file rw_fifo_file_perms;
-+
- allow policykit_t self:unix_dgram_socket create_socket_perms;
--allow policykit_t self:unix_stream_socket create_stream_socket_perms;
-+allow policykit_t self:unix_stream_socket { create_stream_socket_perms connectto };
-
- policykit_domtrans_auth(policykit_t)
-
-@@ -57,10 +58,14 @@
- manage_files_pattern(policykit_t, policykit_var_run_t, policykit_var_run_t)
- files_pid_filetrans(policykit_t, policykit_var_run_t, { file dir })
-
-+kernel_read_system_state(policykit_t)
- kernel_read_kernel_sysctls(policykit_t)
-
- files_read_etc_files(policykit_t)
- files_read_usr_files(policykit_t)
-+files_dontaudit_search_all_mountpoints(policykit_t)
-+
-+fs_list_inotifyfs(policykit_t)
-
- auth_use_nsswitch(policykit_t)
-
-@@ -68,21 +73,43 @@
-
- miscfiles_read_localization(policykit_t)
-
-+userdom_getattr_all_users(policykit_t)
- userdom_read_all_users_state(policykit_t)
-+userdom_dontaudit_search_admin_dir(policykit_t)
-+
-+optional_policy(`
-+ dbus_system_domain(policykit_t, policykit_exec_t)
-+
-+ optional_policy(`
-+ consolekit_dbus_chat(policykit_t)
-+ ')
-+
-+ optional_policy(`
-+ rpm_dbus_chat(policykit_t)
-+ ')
-+')
-+
-+optional_policy(`
-+ gnome_read_config(policykit_t)
-+')
-
- ########################################
- #
- # polkit_auth local policy
- #
-
--allow policykit_auth_t self:capability setgid;
--allow policykit_auth_t self:process getattr;
--allow policykit_auth_t self:fifo_file rw_file_perms;
-+allow policykit_auth_t self:capability { setgid setuid };
-+dontaudit policykit_auth_t self:capability sys_tty_config;
-+allow policykit_auth_t self:process { getattr getsched signal };
-+allow policykit_auth_t self:fifo_file rw_fifo_file_perms;
-+
- allow policykit_auth_t self:unix_dgram_socket create_socket_perms;
- allow policykit_auth_t self:unix_stream_socket create_stream_socket_perms;
-
-+policykit_dbus_chat(policykit_auth_t)
-+
- can_exec(policykit_auth_t, policykit_auth_exec_t)
--corecmd_search_bin(policykit_auth_t)
-+corecmd_exec_bin(policykit_auth_t)
-
- rw_files_pattern(policykit_auth_t, policykit_reload_t, policykit_reload_t)
-
-@@ -92,21 +119,29 @@
- manage_files_pattern(policykit_auth_t, policykit_var_run_t, policykit_var_run_t)
- files_pid_filetrans(policykit_auth_t, policykit_var_run_t, { file dir })
-
--kernel_read_system_state(policykit_auth_t)
-+dev_read_video_dev(policykit_auth_t)
-
- files_read_etc_files(policykit_auth_t)
- files_read_usr_files(policykit_auth_t)
-+files_search_home(policykit_auth_t)
-+
-+fs_getattr_all_fs(polkit_auth_t)
-+fs_search_tmpfs(polkit_auth_t)
-
- auth_use_nsswitch(policykit_auth_t)
-+auth_domtrans_chk_passwd(policykit_auth_t)
-
- logging_send_syslog_msg(policykit_auth_t)
-
- miscfiles_read_localization(policykit_auth_t)
-+miscfiles_read_fonts(policykit_auth_t)
-+miscfiles_setattr_fonts_cache_dirs(policykit_auth_t)
-
- userdom_dontaudit_read_user_home_content_files(policykit_auth_t)
-+userdom_read_admin_home_files(policykit_auth_t)
-
- optional_policy(`
-- dbus_system_bus_client(policykit_auth_t)
-+ dbus_system_domain( policykit_auth_t, policykit_auth_exec_t)
- dbus_session_bus_client(policykit_auth_t)
-
- optional_policy(`
-@@ -119,6 +154,14 @@
- hal_read_state(policykit_auth_t)
- ')
-
-+optional_policy(`
-+ xserver_stream_connect(policykit_auth_t)
-+ xserver_xdm_append_log(policykit_auth_t)
-+ xserver_read_xdm_pid(policykit_auth_t)
-+ xserver_search_xdm_lib(policykit_auth_t)
-+ xserver_create_xdm_tmp_sockets(policykit_auth_t)
-+')
-+
- ########################################
- #
- # polkit_grant local policy
-@@ -126,7 +169,8 @@
-
- allow policykit_grant_t self:capability setuid;
- allow policykit_grant_t self:process getattr;
--allow policykit_grant_t self:fifo_file rw_file_perms;
-+allow policykit_grant_t self:fifo_file rw_fifo_file_perms;
-+
- allow policykit_grant_t self:unix_dgram_socket create_socket_perms;
- allow policykit_grant_t self:unix_stream_socket create_stream_socket_perms;
-
-@@ -156,9 +200,12 @@
- userdom_read_all_users_state(policykit_grant_t)
-
- optional_policy(`
-- dbus_system_bus_client(policykit_grant_t)
-+ cron_manage_system_job_lib_files(policykit_grant_t)
-+')
-
- optional_policy(`
-+ dbus_system_bus_client(policykit_grant_t)
-+ optional_policy(`
- consolekit_dbus_chat(policykit_grant_t)
- ')
- ')
-@@ -170,7 +217,8 @@
-
- allow policykit_resolve_t self:capability { setuid sys_nice sys_ptrace };
- allow policykit_resolve_t self:process getattr;
--allow policykit_resolve_t self:fifo_file rw_file_perms;
-+allow policykit_resolve_t self:fifo_file rw_fifo_file_perms;
-+
- allow policykit_resolve_t self:unix_dgram_socket create_socket_perms;
- allow policykit_resolve_t self:unix_stream_socket create_stream_socket_perms;
-
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/portreserve.te serefpolicy-3.7.15/policy/modules/services/portreserve.te
---- nsaserefpolicy/policy/modules/services/portreserve.te 2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/portreserve.te 2010-03-18 10:44:43.000000000 -0400
-@@ -21,6 +21,7 @@
- # Portreserve local policy
- #
-
-+allow portreserve_t self:capability { dac_read_search dac_override };
- allow portreserve_t self:fifo_file rw_fifo_file_perms;
- allow portreserve_t self:unix_stream_socket create_stream_socket_perms;
- allow portreserve_t self:unix_dgram_socket { create_socket_perms sendto };
-@@ -37,6 +38,8 @@
- manage_sock_files_pattern(portreserve_t, portreserve_var_run_t, portreserve_var_run_t)
- files_pid_filetrans(portreserve_t, portreserve_var_run_t, { file sock_file })
-
-+corecmd_getattr_bin_files(portreserve_t)
-+
- corenet_all_recvfrom_unlabeled(portreserve_t)
- corenet_all_recvfrom_netlabel(portreserve_t)
- corenet_tcp_bind_generic_node(portreserve_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.fc serefpolicy-3.7.15/policy/modules/services/postfix.fc
---- nsaserefpolicy/policy/modules/services/postfix.fc 2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/postfix.fc 2010-03-18 10:44:43.000000000 -0400
-@@ -29,12 +29,10 @@
- /usr/lib/postfix/smtpd -- gen_context(system_u:object_r:postfix_smtpd_exec_t,s0)
- /usr/lib/postfix/bounce -- gen_context(system_u:object_r:postfix_bounce_exec_t,s0)
- /usr/lib/postfix/pipe -- gen_context(system_u:object_r:postfix_pipe_exec_t,s0)
--/usr/lib/postfix/virtual -- gen_context(system_u:object_r:postfix_virtual_exec_t,s0)
- ')
- /etc/postfix/postfix-script.* -- gen_context(system_u:object_r:postfix_exec_t,s0)
- /etc/postfix/prng_exch -- gen_context(system_u:object_r:postfix_prng_t,s0)
- /usr/sbin/postalias -- gen_context(system_u:object_r:postfix_master_exec_t,s0)
--/usr/sbin/postcat -- gen_context(system_u:object_r:postfix_master_exec_t,s0)
- /usr/sbin/postdrop -- gen_context(system_u:object_r:postfix_postdrop_exec_t,s0)
- /usr/sbin/postfix -- gen_context(system_u:object_r:postfix_master_exec_t,s0)
- /usr/sbin/postkick -- gen_context(system_u:object_r:postfix_master_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.if serefpolicy-3.7.15/policy/modules/services/postfix.if
---- nsaserefpolicy/policy/modules/services/postfix.if 2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/postfix.if 2010-03-18 10:44:43.000000000 -0400
-@@ -46,6 +46,7 @@
-
- allow postfix_$1_t postfix_etc_t:dir list_dir_perms;
- read_files_pattern(postfix_$1_t, postfix_etc_t, postfix_etc_t)
-+ read_lnk_files_pattern(postfix_$1_t, postfix_etc_t, postfix_etc_t)
-
- can_exec(postfix_$1_t, postfix_$1_exec_t)
-
-@@ -79,6 +80,7 @@
- files_read_usr_symlinks(postfix_$1_t)
- files_search_spool(postfix_$1_t)
- files_getattr_tmp_dirs(postfix_$1_t)
-+ files_search_all_mountpoints(postfix_$1_t)
-
- init_dontaudit_use_fds(postfix_$1_t)
- init_sigchld(postfix_$1_t)
-@@ -110,6 +112,13 @@
- template(`postfix_server_domain_template',`
- postfix_domain_template($1)
-
-+ type postfix_$1_tmp_t;
-+ files_tmp_file(postfix_$1_tmp_t)
-+
-+ manage_dirs_pattern(postfix_$1_t, postfix_$1_tmp_t, postfix_$1_tmp_t)
-+ manage_files_pattern(postfix_$1_t, postfix_$1_tmp_t, postfix_$1_tmp_t)
-+ files_tmp_filetrans(postfix_$1_t, postfix_$1_tmp_t, { file dir })
-+
- allow postfix_$1_t self:capability { setuid setgid dac_override };
- allow postfix_$1_t postfix_master_t:unix_stream_socket { connectto rw_stream_socket_perms };
- allow postfix_$1_t self:tcp_socket create_socket_perms;
-@@ -174,9 +183,8 @@
- type postfix_etc_t;
- ')
-
-- allow $1 postfix_etc_t:dir list_dir_perms;
-- allow $1 postfix_etc_t:file read_file_perms;
-- allow $1 postfix_etc_t:lnk_file read_lnk_file_perms;
-+ read_files_pattern($1, postfix_etc_t, postfix_etc_t)
-+ read_lnk_files_pattern($1, postfix_etc_t, postfix_etc_t)
- files_search_etc($1)
- ')
-
-@@ -232,6 +240,25 @@
-
- ########################################
- ##
-+## Allow read/write postfix local pipes
-+## TCP sockets.
-+##
-+##
-+##
-+## Domain to not audit.
-+##
-+##
-+#
-+interface(`postfix_rw_local_pipes',`
-+ gen_require(`
-+ type postfix_local_t;
-+ ')
-+
-+ allow $1 postfix_local_t:fifo_file rw_fifo_file_perms;
-+')
-+
-+########################################
-+##
- ## Allow domain to read postfix local process state
- ##
- ##
-@@ -368,6 +395,25 @@
- can_exec($1, postfix_master_exec_t)
- ')
-
-+#######################################
-+##
-+## Connect to postfix master process using a unix domain stream socket.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+##
-+#
-+interface(`postfix_stream_connect_master',`
-+ gen_require(`
-+ type postfix_master_t, postfix_public_t;
-+ ')
-+
-+ stream_connect_pattern($1, postfix_public_t, postfix_public_t, postfix_master_t)
-+')
-+
- ########################################
- ##
- ## Create a named socket in a postfix private directory.
-@@ -378,7 +424,7 @@
- ##
- ##
- #
--interface(`postfix_create_pivate_sockets',`
-+interface(`postfix_create_private_sockets',`
- gen_require(`
- type postfix_private_t;
- ')
-@@ -389,6 +435,25 @@
-
- ########################################
- ##
-+## manage named socket in a postfix private directory.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`postfix_manage_private_sockets',`
-+ gen_require(`
-+ type postfix_private_t;
-+ ')
-+
-+ allow $1 postfix_private_t:dir list_dir_perms;
-+ manage_sock_files_pattern($1, postfix_private_t, postfix_private_t)
-+')
-+
-+########################################
-+##
- ## Execute the master postfix program in the
- ## postfix_master domain.
- ##
-@@ -418,10 +483,10 @@
- #
- interface(`postfix_search_spool',`
- gen_require(`
-- type postfix_spool_t;
-+ attribute postfix_spool_type;
- ')
-
-- allow $1 postfix_spool_t:dir search_dir_perms;
-+ allow $1 postfix_spool_type:dir search_dir_perms;
- files_search_spool($1)
- ')
-
-@@ -437,15 +502,34 @@
- #
- interface(`postfix_list_spool',`
- gen_require(`
-- type postfix_spool_t;
-+ attribute postfix_spool_type;
- ')
-
-- allow $1 postfix_spool_t:dir list_dir_perms;
-+ allow $1 postfix_spool_type:dir list_dir_perms;
- files_search_spool($1)
- ')
-
- ########################################
- ##
-+## Getattr postfix mail spool files.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`postfix_getattr_spool_files',`
-+ gen_require(`
-+ attribute postfix_spool_type;
-+ ')
-+
-+ files_search_spool($1)
-+ getattr_files_pattern($1, postfix_spool_type, postfix_spool_type)
-+')
-+
-+########################################
-+##
- ## Read postfix mail spool files.
- ##
- ##
-@@ -456,16 +540,16 @@
- #
- interface(`postfix_read_spool_files',`
- gen_require(`
-- type postfix_spool_t;
-+ attribute postfix_spool_type;
- ')
-
- files_search_spool($1)
-- read_files_pattern($1, postfix_spool_t, postfix_spool_t)
-+ read_files_pattern($1, postfix_spool_type, postfix_spool_type)
- ')
-
- ########################################
- ##
--## Create, read, write, and delete postfix mail spool files.
-+## Manage postfix mail spool files.
- ##
- ##
- ##
-@@ -475,11 +559,11 @@
- #
- interface(`postfix_manage_spool_files',`
- gen_require(`
-- type postfix_spool_t;
-+ attribute postfix_spool_type;
- ')
-
- files_search_spool($1)
-- manage_files_pattern($1, postfix_spool_t, postfix_spool_t)
-+ manage_files_pattern($1, postfix_spool_type, postfix_spool_type)
- ')
-
- ########################################
-@@ -500,3 +584,80 @@
-
- typeattribute $1 postfix_user_domtrans;
- ')
-+
-+########################################
-+##
-+## Execute the master postdrop in the
-+## postfix_postdrop domain.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`postfix_domtrans_postdrop',`
-+ gen_require(`
-+ type postfix_postdrop_t, postfix_postdrop_exec_t;
-+ ')
-+
-+ domtrans_pattern($1, postfix_postdrop_exec_t, postfix_postdrop_t)
-+')
-+
-+########################################
-+##
-+## Execute the master postqueue in the
-+## postfix_postqueue domain.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`postfix_domtrans_postqueue',`
-+ gen_require(`
-+ type postfix_postqueue_t, postfix_postqueue_exec_t;
-+ ')
-+
-+ domtrans_pattern($1, postfix_postqueue_exec_t, postfix_postqueue_t)
-+')
-+
-+#######################################
-+##
-+## Execute the master postqueue in the caller domain.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`posftix_exec_postqueue',`
-+ gen_require(`
-+ type postfix_postqueue_exec_t;
-+ ')
-+
-+ can_exec($1, postfix_postqueue_exec_t)
-+')
-+
-+########################################
-+##
-+## Execute the master postdrop in the
-+## postfix_postdrop domain.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`postfix_run_postdrop',`
-+ gen_require(`
-+ type postfix_postdrop_t;
-+ ')
-+
-+ postfix_domtrans_postdrop($1)
-+ role $2 types postfix_postdrop_t;
-+')
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-3.7.15/policy/modules/services/postfix.te
---- nsaserefpolicy/policy/modules/services/postfix.te 2010-02-12 10:33:09.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/postfix.te 2010-03-18 10:44:43.000000000 -0400
-@@ -6,6 +6,15 @@
- # Declarations
- #
-
-+##
-+##
-+## Allow postfix_local domain full write access to mail_spool directories
-+##
-+##
-+##
-+gen_tunable(allow_postfix_local_write_mail_spool, false)
-+
-+attribute postfix_spool_type;
- attribute postfix_user_domains;
- # domains that transition to the
- # postfix user domains
-@@ -13,13 +22,13 @@
-
- postfix_server_domain_template(bounce)
-
--type postfix_spool_bounce_t;
-+type postfix_spool_bounce_t, postfix_spool_type;
- files_type(postfix_spool_bounce_t)
-
- postfix_server_domain_template(cleanup)
-
- type postfix_etc_t;
--files_type(postfix_etc_t)
-+files_config_file(postfix_etc_t)
-
- type postfix_exec_t;
- application_executable_file(postfix_exec_t)
-@@ -27,13 +36,20 @@
- postfix_server_domain_template(local)
- mta_mailserver_delivery(postfix_local_t)
-
--type postfix_local_tmp_t;
--files_tmp_file(postfix_local_tmp_t)
-+# Handle vacation script
-+mta_send_mail(postfix_local_t)
-+
-+userdom_read_user_home_content_files(postfix_local_t)
-+
-+tunable_policy(`allow_postfix_local_write_mail_spool',`
-+ mta_manage_spool(postfix_local_t)
-+')
-
- # Program for creating database files
- type postfix_map_t;
- type postfix_map_exec_t;
- application_domain(postfix_map_t, postfix_map_exec_t)
-+role system_r types postfix_map_t;
-
- type postfix_map_tmp_t;
- files_tmp_file(postfix_map_tmp_t)
-@@ -68,13 +84,13 @@
-
- postfix_server_domain_template(smtpd)
-
--type postfix_spool_t;
-+type postfix_spool_t, postfix_spool_type;
- files_type(postfix_spool_t)
-
--type postfix_spool_maildrop_t;
-+type postfix_spool_maildrop_t, postfix_spool_type;
- files_type(postfix_spool_maildrop_t)
-
--type postfix_spool_flush_t;
-+type postfix_spool_flush_t, postfix_spool_type;
- files_type(postfix_spool_flush_t)
-
- type postfix_public_t;
-@@ -90,9 +106,6 @@
- postfix_server_domain_template(virtual)
- mta_mailserver_delivery(postfix_virtual_t)
-
--type postfix_virtual_tmp_t;
--files_tmp_file(postfix_virtual_tmp_t)
--
- ########################################
- #
- # Postfix master process local policy
-@@ -103,6 +116,7 @@
- allow postfix_master_t self:fifo_file rw_fifo_file_perms;
- allow postfix_master_t self:tcp_socket create_stream_socket_perms;
- allow postfix_master_t self:udp_socket create_socket_perms;
-+allow postfix_master_t self:process setrlimit;
-
- allow postfix_master_t postfix_etc_t:file rw_file_perms;
-
-@@ -132,6 +146,7 @@
- # allow access to deferred queue and allow removing bogus incoming entries
- manage_dirs_pattern(postfix_master_t, postfix_spool_t, postfix_spool_t)
- manage_files_pattern(postfix_master_t, postfix_spool_t, postfix_spool_t)
-+files_spool_filetrans(postfix_master_t, postfix_spool_t, dir)
-
- allow postfix_master_t postfix_spool_bounce_t:dir manage_dir_perms;
- allow postfix_master_t postfix_spool_bounce_t:file getattr;
-@@ -142,6 +157,7 @@
-
- delete_files_pattern(postfix_master_t, postfix_spool_maildrop_t, postfix_spool_maildrop_t)
- rename_files_pattern(postfix_master_t, postfix_spool_maildrop_t, postfix_spool_maildrop_t)
-+setattr_dirs_pattern(postfix_master_t, postfix_spool_maildrop_t, postfix_spool_maildrop_t)
-
- kernel_read_all_sysctls(postfix_master_t)
-
-@@ -153,6 +169,9 @@
- corenet_udp_sendrecv_generic_node(postfix_master_t)
- corenet_tcp_sendrecv_all_ports(postfix_master_t)
- corenet_udp_sendrecv_all_ports(postfix_master_t)
-+corenet_udp_bind_generic_node(postfix_master_t)
-+corenet_udp_bind_all_unreserved_ports(postfix_master_t)
-+corenet_dontaudit_udp_bind_all_ports(postfix_master_t)
- corenet_tcp_bind_generic_node(postfix_master_t)
- corenet_tcp_bind_amavisd_send_port(postfix_master_t)
- corenet_tcp_bind_smtp_port(postfix_master_t)
-@@ -170,6 +189,8 @@
- domain_use_interactive_fds(postfix_master_t)
-
- files_read_usr_files(postfix_master_t)
-+files_search_var_lib(postfix_master_t)
-+files_search_tmp(postfix_master_t)
-
- term_dontaudit_search_ptys(postfix_master_t)
-
-@@ -181,6 +202,7 @@
-
- mta_rw_aliases(postfix_master_t)
- mta_read_sendmail_bin(postfix_master_t)
-+mta_getattr_spool(postfix_master_t)
-
- ifdef(`distro_redhat',`
- # for newer main.cf that uses /etc/aliases
-@@ -193,6 +215,10 @@
- ')
-
- optional_policy(`
-+ kerberos_keytab_template(postfix, postfix_t)
-+')
-+
-+optional_policy(`
- # for postalias
- mailman_manage_data_files(postfix_master_t)
- ')
-@@ -202,6 +228,10 @@
- ')
-
- optional_policy(`
-+ postgrey_search_spool(postfix_master_t)
-+')
-+
-+optional_policy(`
- sendmail_signal(postfix_master_t)
- ')
-
-@@ -219,6 +249,7 @@
- manage_dirs_pattern(postfix_bounce_t, postfix_spool_t, postfix_spool_t)
- manage_files_pattern(postfix_bounce_t, postfix_spool_t, postfix_spool_t)
- manage_lnk_files_pattern(postfix_bounce_t, postfix_spool_t, postfix_spool_t)
-+files_spool_filetrans(postfix_bounce_t, postfix_spool_t, dir)
-
- manage_dirs_pattern(postfix_bounce_t, postfix_spool_bounce_t, postfix_spool_bounce_t)
- manage_files_pattern(postfix_bounce_t, postfix_spool_bounce_t, postfix_spool_bounce_t)
-@@ -240,11 +271,18 @@
- manage_dirs_pattern(postfix_cleanup_t, postfix_spool_t, postfix_spool_t)
- manage_files_pattern(postfix_cleanup_t, postfix_spool_t, postfix_spool_t)
- manage_lnk_files_pattern(postfix_cleanup_t, postfix_spool_t, postfix_spool_t)
-+files_spool_filetrans(postfix_cleanup_t, postfix_spool_t, dir)
-
- allow postfix_cleanup_t postfix_spool_bounce_t:dir list_dir_perms;
-
- corecmd_exec_bin(postfix_cleanup_t)
-
-+mta_read_aliases(postfix_cleanup_t)
-+
-+optional_policy(`
-+ mailman_read_data_files(postfix_cleanup_t)
-+')
-+
- ########################################
- #
- # Postfix local local policy
-@@ -253,10 +291,6 @@
- allow postfix_local_t self:fifo_file rw_fifo_file_perms;
- allow postfix_local_t self:process { setsched setrlimit };
-
--manage_dirs_pattern(postfix_local_t, postfix_local_tmp_t, postfix_local_tmp_t)
--manage_files_pattern(postfix_local_t, postfix_local_tmp_t, postfix_local_tmp_t)
--files_tmp_filetrans(postfix_local_t, postfix_local_tmp_t, { file dir })
--
- # connect to master process
- stream_connect_pattern(postfix_local_t, postfix_public_t, postfix_public_t, postfix_master_t)
-
-@@ -270,18 +304,31 @@
-
- files_read_etc_files(postfix_local_t)
-
-+logging_dontaudit_search_logs(postfix_local_t)
-+
- mta_read_aliases(postfix_local_t)
- mta_delete_spool(postfix_local_t)
- # For reading spamassasin
- mta_read_config(postfix_local_t)
-
-+domtrans_pattern(postfix_local_t, postfix_postdrop_exec_t, postfix_postdrop_t)
-+# Might be a leak, but I need a postfix expert to explain
-+allow postfix_postdrop_t postfix_local_t:unix_stream_socket { read write };
-+
- optional_policy(`
- clamav_search_lib(postfix_local_t)
-+ clamav_exec_clamscan(postfix_local_t)
- ')
-
- optional_policy(`
- # for postalias
- mailman_manage_data_files(postfix_local_t)
-+ mailman_append_log(postfix_local_t)
-+ mailman_read_log(postfix_local_t)
-+')
-+
-+optional_policy(`
-+ nagios_search_spool(postfix_local_t)
- ')
-
- optional_policy(`
-@@ -292,8 +339,7 @@
- #
- # Postfix map local policy
- #
--
--allow postfix_map_t self:capability setgid;
-+allow postfix_map_t self:capability { dac_override setgid setuid };
- allow postfix_map_t self:unix_stream_socket create_stream_socket_perms;
- allow postfix_map_t self:unix_dgram_socket create_socket_perms;
- allow postfix_map_t self:tcp_socket create_stream_socket_perms;
-@@ -340,14 +386,15 @@
-
- miscfiles_read_localization(postfix_map_t)
-
--seutil_read_config(postfix_map_t)
--
--userdom_use_user_terminals(postfix_map_t)
--
- optional_policy(`
- locallogin_dontaudit_use_fds(postfix_map_t)
- ')
-
-+optional_policy(`
-+# for postalias
-+ mailman_manage_data_files(postfix_map_t)
-+')
-+
- ########################################
- #
- # Postfix pickup local policy
-@@ -372,6 +419,7 @@
- #
-
- allow postfix_pipe_t self:fifo_file rw_fifo_file_perms;
-+allow postfix_pipe_t self:process setrlimit;
-
- write_sock_files_pattern(postfix_pipe_t, postfix_private_t, postfix_private_t)
-
-@@ -379,6 +427,12 @@
-
- rw_files_pattern(postfix_pipe_t, postfix_spool_t, postfix_spool_t)
-
-+domtrans_pattern(postfix_pipe_t, postfix_postdrop_exec_t, postfix_postdrop_t)
-+
-+optional_policy(`
-+ dovecot_domtrans_deliver(postfix_pipe_t)
-+')
-+
- optional_policy(`
- procmail_domtrans(postfix_pipe_t)
- ')
-@@ -388,6 +442,16 @@
- ')
-
- optional_policy(`
-+ mta_manage_spool(postfix_pipe_t)
-+ mta_send_mail(postfix_pipe_t)
-+')
-+
-+optional_policy(`
-+ spamassassin_domtrans_client(postfix_pipe_t)
-+ spamassassin_kill_client(postfix_pipe_t)
-+')
-+
-+optional_policy(`
- uucp_domtrans_uux(postfix_pipe_t)
- ')
-
-@@ -415,6 +479,10 @@
- mta_rw_user_mail_stream_sockets(postfix_postdrop_t)
-
- optional_policy(`
-+ apache_dontaudit_rw_fifo_file(postfix_postdrop_t)
-+')
-+
-+optional_policy(`
- cron_system_entry(postfix_postdrop_t, postfix_postdrop_exec_t)
- ')
-
-@@ -424,8 +492,11 @@
- ')
-
- optional_policy(`
-- ppp_use_fds(postfix_postqueue_t)
-- ppp_sigchld(postfix_postqueue_t)
-+ sendmail_rw_unix_stream_sockets(postfix_postdrop_t)
-+')
-+
-+optional_policy(`
-+ uucp_manage_spool(postfix_postdrop_t)
- ')
-
- #######################################
-@@ -451,6 +522,15 @@
- init_sigchld_script(postfix_postqueue_t)
- init_use_script_fds(postfix_postqueue_t)
-
-+optional_policy(`
-+ cron_system_entry(postfix_postqueue_t, postfix_postqueue_exec_t)
-+')
-+
-+optional_policy(`
-+ ppp_use_fds(postfix_postqueue_t)
-+ ppp_sigchld(postfix_postqueue_t)
-+')
-+
- ########################################
- #
- # Postfix qmgr local policy
-@@ -464,6 +544,7 @@
- manage_dirs_pattern(postfix_qmgr_t, postfix_spool_t, postfix_spool_t)
- manage_files_pattern(postfix_qmgr_t, postfix_spool_t, postfix_spool_t)
- manage_lnk_files_pattern(postfix_qmgr_t, postfix_spool_t, postfix_spool_t)
-+files_spool_filetrans(postfix_qmgr_t, postfix_spool_t, dir)
-
- allow postfix_qmgr_t postfix_spool_bounce_t:dir list_dir_perms;
- allow postfix_qmgr_t postfix_spool_bounce_t:file read_file_perms;
-@@ -499,13 +580,14 @@
- #
-
- # connect to master process
-+allow postfix_smtp_t self:capability sys_chroot;
- stream_connect_pattern(postfix_smtp_t, { postfix_private_t postfix_public_t }, { postfix_private_t postfix_public_t },postfix_master_t)
-
- allow postfix_smtp_t postfix_prng_t:file rw_file_perms;
-
- allow postfix_smtp_t postfix_spool_t:file rw_file_perms;
-
--files_dontaudit_getattr_home_dir(postfix_smtp_t)
-+files_search_all_mountpoints(postfix_smtp_t)
-
- optional_policy(`
- cyrus_stream_connect(postfix_smtp_t)
-@@ -535,9 +617,18 @@
-
- # for OpenSSL certificates
- files_read_usr_files(postfix_smtpd_t)
-+
-+# postfix checks the size of all mounted file systems
-+fs_getattr_all_dirs(postfix_smtpd_t)
-+fs_getattr_all_fs(postfix_smtpd_t)
-+
- mta_read_aliases(postfix_smtpd_t)
-
- optional_policy(`
-+ dovecot_stream_connect_auth(postfix_smtpd_t)
-+')
-+
-+optional_policy(`
- mailman_read_data_files(postfix_smtpd_t)
- ')
-
-@@ -559,20 +650,22 @@
-
- allow postfix_virtual_t postfix_spool_t:file rw_file_perms;
-
--manage_dirs_pattern(postfix_virtual_t, postfix_virtual_tmp_t, postfix_virtual_tmp_t)
--manage_files_pattern(postfix_virtual_t, postfix_virtual_tmp_t, postfix_virtual_tmp_t)
--files_tmp_filetrans(postfix_virtual_t, postfix_virtual_tmp_t, { file dir })
--
- # connect to master process
--stream_connect_pattern(postfix_virtual_t, postfix_public_t, postfix_public_t, postfix_master_t)
-+stream_connect_pattern(postfix_virtual_t, { postfix_private_t postfix_public_t }, { postfix_private_t postfix_public_t }, postfix_master_t)
-
- corecmd_exec_shell(postfix_virtual_t)
- corecmd_exec_bin(postfix_virtual_t)
-
- files_read_etc_files(postfix_virtual_t)
-+files_read_usr_files(postfix_virtual_t)
-
- mta_read_aliases(postfix_virtual_t)
- mta_delete_spool(postfix_virtual_t)
- # For reading spamassasin
- mta_read_config(postfix_virtual_t)
- mta_manage_spool(postfix_virtual_t)
-+
-+userdom_manage_user_home_dirs(postfix_virtual_t)
-+userdom_manage_user_home_content(postfix_virtual_t)
-+userdom_home_filetrans_user_home_dir(postfix_virtual_t)
-+userdom_user_home_dir_filetrans_user_home_content(postfix_virtual_t, {file dir })
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.fc serefpolicy-3.7.15/policy/modules/services/postgresql.fc
---- nsaserefpolicy/policy/modules/services/postgresql.fc 2010-02-12 10:33:09.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/postgresql.fc 2010-03-18 10:44:43.000000000 -0400
-@@ -3,6 +3,7 @@
- #
- /etc/postgresql(/.*)? gen_context(system_u:object_r:postgresql_etc_t,s0)
- /etc/rc\.d/init\.d/(se)?postgresql -- gen_context(system_u:object_r:postgresql_initrc_exec_t,s0)
-+/etc/sysconfig/pgsql(/.*)? gen_context(system_u:object_r:postgresql_etc_t,s0)
-
- #
- # /usr
-@@ -10,9 +11,8 @@
- /usr/bin/initdb(\.sepgsql)? -- gen_context(system_u:object_r:postgresql_exec_t,s0)
- /usr/bin/(se)?postgres -- gen_context(system_u:object_r:postgresql_exec_t,s0)
-
--/usr/lib/pgsql/test/regres(/.*)? gen_context(system_u:object_r:postgresql_db_t,s0)
--/usr/lib/pgsql/test/regress/pg_regress -- gen_context(system_u:object_r:postgresql_exec_t,s0)
--
-+/usr/lib(64)?/pgsql/test/regress(/.*)? gen_context(system_u:object_r:postgresql_db_t,s0)
-+/usr/lib(64)?/pgsql/test/regress/pg_regress -- gen_context(system_u:object_r:postgresql_exec_t,s0)
- /usr/lib(64)?/postgresql/bin/.* -- gen_context(system_u:object_r:postgresql_exec_t,s0)
-
- ifdef(`distro_debian', `
-@@ -44,3 +44,5 @@
- ')
-
- /var/run/postgresql(/.*)? gen_context(system_u:object_r:postgresql_var_run_t,s0)
-+
-+/var/run/postmaster.* gen_context(system_u:object_r:postgresql_var_run_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.if serefpolicy-3.7.15/policy/modules/services/postgresql.if
---- nsaserefpolicy/policy/modules/services/postgresql.if 2010-02-12 10:33:09.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/postgresql.if 2010-03-18 10:44:43.000000000 -0400
-@@ -125,6 +125,23 @@
- typeattribute $1 sepgsql_table_type;
- ')
-
-+######################################
-+##
-+## Allow domain to signal postgresql
-+##
-+##
-+##
-+## Domain to not audit.
-+##
-+##
-+#
-+interface(`postgresql_signal',`
-+ gen_require(`
-+ type postgresql_t;
-+ ')
-+ allow $1 postgresql_t:process signal;
-+')
-+
- ########################################
- ##
- ## Marks as a SE-PostgreSQL system table/column/tuple object type
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.te serefpolicy-3.7.15/policy/modules/services/postgresql.te
---- nsaserefpolicy/policy/modules/services/postgresql.te 2010-02-12 10:33:09.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/postgresql.te 2010-03-18 10:44:43.000000000 -0400
-@@ -150,6 +150,7 @@
- dontaudit postgresql_t self:capability { sys_tty_config sys_admin };
- allow postgresql_t self:process signal_perms;
- allow postgresql_t self:fifo_file rw_fifo_file_perms;
-+allow postgresql_t self:file { getattr read };
- allow postgresql_t self:sem create_sem_perms;
- allow postgresql_t self:shm create_shm_perms;
- allow postgresql_t self:tcp_socket create_stream_socket_perms;
-@@ -220,9 +221,11 @@
- corenet_udp_sendrecv_generic_node(postgresql_t)
- corenet_tcp_sendrecv_all_ports(postgresql_t)
- corenet_udp_sendrecv_all_ports(postgresql_t)
-+corenet_udp_bind_generic_node(postgresql_t)
- corenet_tcp_bind_generic_node(postgresql_t)
- corenet_tcp_bind_postgresql_port(postgresql_t)
- corenet_tcp_connect_auth_port(postgresql_t)
-+corenet_tcp_connect_postgresql_port(postgresql_t)
- corenet_sendrecv_postgresql_server_packets(postgresql_t)
- corenet_sendrecv_auth_client_packets(postgresql_t)
-
-@@ -253,11 +256,12 @@
- files_read_etc_runtime_files(postgresql_t)
- files_read_usr_files(postgresql_t)
-
--auth_use_nsswitch(postgresql_t)
-+auth_use_pam(postgresql_t)
-
- init_read_utmp(postgresql_t)
-
- logging_send_syslog_msg(postgresql_t)
-+logging_send_audit_msgs(postgresql_t)
-
- miscfiles_read_localization(postgresql_t)
-
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.fc serefpolicy-3.7.15/policy/modules/services/ppp.fc
---- nsaserefpolicy/policy/modules/services/ppp.fc 2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/ppp.fc 2010-03-18 10:44:43.000000000 -0400
-@@ -3,6 +3,7 @@
- #
- /etc/rc\.d/init\.d/ppp -- gen_context(system_u:object_r:pppd_initrc_exec_t,s0)
-
-+/root/.ppprc -- gen_context(system_u:object_r:pppd_etc_t,s0)
- /etc/ppp -d gen_context(system_u:object_r:pppd_etc_t,s0)
- /etc/ppp(/.*)? -- gen_context(system_u:object_r:pppd_etc_rw_t,s0)
- /etc/ppp/peers(/.*)? gen_context(system_u:object_r:pppd_etc_rw_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.if serefpolicy-3.7.15/policy/modules/services/ppp.if
---- nsaserefpolicy/policy/modules/services/ppp.if 2010-01-18 15:04:31.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/ppp.if 2010-03-18 10:44:43.000000000 -0400
-@@ -182,6 +182,10 @@
- ppp_domtrans($1)
- role $2 types pppd_t;
- role $2 types pptp_t;
-+
-+ optional_policy(`
-+ ddclient_run(pppd_t, $2)
-+ ')
- ')
-
- ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.te serefpolicy-3.7.15/policy/modules/services/ppp.te
---- nsaserefpolicy/policy/modules/services/ppp.te 2010-01-18 15:04:31.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/ppp.te 2010-03-18 10:44:43.000000000 -0400
-@@ -71,9 +71,9 @@
- # PPPD Local policy
- #
-
--allow pppd_t self:capability { kill net_admin setuid setgid fsetid fowner net_raw dac_override };
-+allow pppd_t self:capability { kill net_admin setuid setgid sys_admin fsetid fowner net_raw dac_override };
- dontaudit pppd_t self:capability sys_tty_config;
--allow pppd_t self:process signal;
-+allow pppd_t self:process { getsched signal };
- allow pppd_t self:fifo_file rw_fifo_file_perms;
- allow pppd_t self:socket create_socket_perms;
- allow pppd_t self:unix_dgram_socket create_socket_perms;
-@@ -168,6 +168,7 @@
- auth_use_nsswitch(pppd_t)
-
- logging_send_syslog_msg(pppd_t)
-+logging_send_audit_msgs(pppd_t)
-
- miscfiles_read_localization(pppd_t)
-
-@@ -193,6 +194,8 @@
-
- optional_policy(`
- mta_send_mail(pppd_t)
-+ mta_system_content(pppd_etc_t)
-+ mta_system_content(pppd_etc_rw_t)
- ')
-
- optional_policy(`
-@@ -289,6 +292,7 @@
-
- userdom_dontaudit_use_unpriv_user_fds(pptp_t)
- userdom_dontaudit_search_user_home_dirs(pptp_t)
-+userdom_signal_unpriv_users(pptp_t)
-
- optional_policy(`
- consoletype_exec(pppd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelude.te serefpolicy-3.7.15/policy/modules/services/prelude.te
---- nsaserefpolicy/policy/modules/services/prelude.te 2009-12-18 11:38:25.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/prelude.te 2010-03-18 10:44:43.000000000 -0400
-@@ -90,6 +90,7 @@
- corenet_tcp_bind_prelude_port(prelude_t)
- corenet_tcp_connect_prelude_port(prelude_t)
- corenet_tcp_connect_postgresql_port(prelude_t)
-+corenet_tcp_connect_mysqld_port(prelude_t)
-
- dev_read_rand(prelude_t)
- dev_read_urand(prelude_t)
-@@ -250,6 +251,8 @@
- files_read_etc_files(prelude_lml_t)
- files_read_etc_runtime_files(prelude_lml_t)
-
-+fs_getattr_all_fs(prelude_lml_t)
-+fs_list_inotifyfs(prelude_lml_t)
- fs_rw_anon_inodefs_files(prelude_lml_t)
-
- auth_use_nsswitch(prelude_lml_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-3.7.15/policy/modules/services/procmail.te
---- nsaserefpolicy/policy/modules/services/procmail.te 2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/procmail.te 2010-03-18 10:44:43.000000000 -0400
-@@ -22,7 +22,7 @@
- # Local policy
- #
-
--allow procmail_t self:capability { sys_nice chown setuid setgid dac_override };
-+allow procmail_t self:capability { sys_nice chown fsetid setuid setgid dac_override };
- allow procmail_t self:process { setsched signal signull };
- allow procmail_t self:fifo_file rw_fifo_file_perms;
- allow procmail_t self:unix_stream_socket create_socket_perms;
-@@ -77,6 +77,7 @@
- files_read_usr_files(procmail_t)
-
- logging_send_syslog_msg(procmail_t)
-+logging_append_all_logs(procmail_t)
-
- miscfiles_read_localization(procmail_t)
-
-@@ -92,6 +93,7 @@
- userdom_dontaudit_search_user_home_dirs(procmail_t)
-
- mta_manage_spool(procmail_t)
-+mta_read_queue(procmail_t)
-
- ifdef(`hide_broken_symptoms',`
- mta_dontaudit_rw_queue(procmail_t)
-@@ -128,6 +130,10 @@
- ')
-
- optional_policy(`
-+ nagios_search_spool(procmail_t)
-+')
-+
-+optional_policy(`
- pyzor_domtrans(procmail_t)
- pyzor_signal(procmail_t)
- ')
-@@ -136,8 +142,8 @@
- mta_read_config(procmail_t)
- sendmail_domtrans(procmail_t)
- sendmail_signal(procmail_t)
-- sendmail_rw_tcp_sockets(procmail_t)
-- sendmail_rw_unix_stream_sockets(procmail_t)
-+ sendmail_dontaudit_rw_tcp_sockets(procmail_t)
-+ sendmail_dontaudit_rw_unix_stream_sockets(procmail_t)
- ')
-
- optional_policy(`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.fc serefpolicy-3.7.15/policy/modules/services/pyzor.fc
---- nsaserefpolicy/policy/modules/services/pyzor.fc 2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/pyzor.fc 2010-03-18 10:44:43.000000000 -0400
-@@ -1,6 +1,10 @@
- /etc/pyzor(/.*)? gen_context(system_u:object_r:pyzor_etc_t, s0)
-+/etc/rc\.d/init\.d/pyzord -- gen_context(system_u:object_r:pyzord_initrc_exec_t,s0)
-
- HOME_DIR/\.pyzor(/.*)? gen_context(system_u:object_r:pyzor_home_t,s0)
-+HOME_DIR/\.spamd(/.*)? gen_context(system_u:object_r:pyzor_home_t,s0)
-+/root/\.pyzor(/.*)? gen_context(system_u:object_r:pyzor_home_t,s0)
-+/root/\.spamd(/.*)? gen_context(system_u:object_r:pyzor_home_t,s0)
-
- /usr/bin/pyzor -- gen_context(system_u:object_r:pyzor_exec_t,s0)
- /usr/bin/pyzord -- gen_context(system_u:object_r:pyzord_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.if serefpolicy-3.7.15/policy/modules/services/pyzor.if
---- nsaserefpolicy/policy/modules/services/pyzor.if 2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/pyzor.if 2010-03-18 10:44:43.000000000 -0400
-@@ -88,3 +88,50 @@
- corecmd_search_bin($1)
- can_exec($1, pyzor_exec_t)
- ')
-+
-+########################################
-+##
-+## All of the rules required to administrate
-+## an pyzor environment
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+##
-+##
-+## The role to be allowed to manage the pyzor domain.
-+##
-+##
-+##
-+#
-+interface(`pyzor_admin',`
-+ gen_require(`
-+ type pyzord_t, pyzor_tmp_t, pyzord_log_t;
-+ type pyzor_etc_t, pyzor_var_lib_t;
-+ type pyzord_initrc_exec_t;
-+ ')
-+
-+ allow $1 pyzord_t:process { ptrace signal_perms };
-+ ps_process_pattern($1, pyzord_t)
-+
-+ init_labeled_script_domtrans($1, pyzord_initrc_exec_t)
-+ domain_system_change_exemption($1)
-+ role_transition $2 pyzord_initrc_exec_t system_r;
-+ allow $2 system_r;
-+
-+ files_list_tmp($1)
-+ admin_pattern($1, pyzor_tmp_t)
-+
-+ logging_list_logs($1)
-+ admin_pattern($1, pyzord_log_t)
-+
-+ files_list_etc($1)
-+ admin_pattern($1, pyzor_etc_t)
-+
-+ files_list_var_lib($1)
-+ admin_pattern($1, pyzor_var_lib_t)
-+')
-+
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.te serefpolicy-3.7.15/policy/modules/services/pyzor.te
---- nsaserefpolicy/policy/modules/services/pyzor.te 2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/pyzor.te 2010-03-18 10:44:43.000000000 -0400
-@@ -6,6 +6,38 @@
- # Declarations
- #
-
-+
-+ifdef(`distro_redhat',`
-+
-+ gen_require(`
-+ type spamc_t;
-+ type spamc_exec_t;
-+ type spamd_t;
-+ type spamd_initrc_exec_t;
-+ type spamd_exec_t;
-+ type spamc_tmp_t;
-+ type spamd_log_t;
-+ type spamd_var_lib_t;
-+ type spamd_etc_t;
-+ type spamc_tmp_t;
-+ type spamc_home_t;
-+ ')
-+
-+ typealias spamc_t alias pyzor_t;
-+ typealias spamc_exec_t alias pyzor_exec_t;
-+ typealias spamd_t alias pyzord_t;
-+ typealias spamd_initrc_exec_t alias pyzord_initrc_exec_t;
-+ typealias spamd_exec_t alias pyzord_exec_t;
-+ typealias spamc_tmp_t alias pyzor_tmp_t;
-+ typealias spamd_log_t alias pyzor_log_t;
-+ typealias spamd_log_t alias pyzord_log_t;
-+ typealias spamd_var_lib_t alias pyzor_var_lib_t;
-+ typealias spamd_etc_t alias pyzor_etc_t;
-+ typealias spamc_home_t alias pyzor_home_t;
-+ typealias spamc_home_t alias user_pyzor_home_t;
-+
-+',`
-+
- type pyzor_t;
- type pyzor_exec_t;
- typealias pyzor_t alias { user_pyzor_t staff_pyzor_t sysadm_pyzor_t };
-@@ -40,6 +72,7 @@
-
- type pyzord_log_t;
- logging_log_file(pyzord_log_t)
-+')
-
- ########################################
- #
-@@ -77,12 +110,16 @@
-
- dev_read_urand(pyzor_t)
-
-+fs_getattr_xattr_fs(pyzor_t)
-+
- files_read_etc_files(pyzor_t)
-
- auth_use_nsswitch(pyzor_t)
-
- miscfiles_read_localization(pyzor_t)
-
-+mta_read_queue(pyzor_t)
-+
- userdom_dontaudit_search_user_home_dirs(pyzor_t)
-
- optional_policy(`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radvd.te serefpolicy-3.7.15/policy/modules/services/radvd.te
---- nsaserefpolicy/policy/modules/services/radvd.te 2009-12-18 11:38:25.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/radvd.te 2010-03-18 10:44:43.000000000 -0400
-@@ -22,9 +22,9 @@
- #
- # Local policy
- #
--allow radvd_t self:capability { setgid setuid net_raw net_admin };
-+allow radvd_t self:capability { kill setgid setuid net_raw net_admin };
- dontaudit radvd_t self:capability sys_tty_config;
--allow radvd_t self:process signal_perms;
-+allow radvd_t self:process { fork signal_perms };
- allow radvd_t self:unix_dgram_socket create_socket_perms;
- allow radvd_t self:unix_stream_socket create_socket_perms;
- allow radvd_t self:rawip_socket create_socket_perms;
-@@ -64,20 +64,16 @@
- files_read_etc_files(radvd_t)
- files_list_usr(radvd_t)
-
-+auth_use_nsswitch(radvd_t)
-+
- logging_send_syslog_msg(radvd_t)
-
- miscfiles_read_localization(radvd_t)
-
--sysnet_read_config(radvd_t)
--
- userdom_dontaudit_use_unpriv_user_fds(radvd_t)
- userdom_dontaudit_search_user_home_dirs(radvd_t)
-
- optional_policy(`
-- nis_use_ypbind(radvd_t)
--')
--
--optional_policy(`
- seutil_sigchld_newrole(radvd_t)
- ')
-
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.fc serefpolicy-3.7.15/policy/modules/services/razor.fc
---- nsaserefpolicy/policy/modules/services/razor.fc 2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/razor.fc 2010-03-18 10:44:43.000000000 -0400
-@@ -1,3 +1,4 @@
-+/root/\.razor(/.*)? gen_context(system_u:object_r:razor_home_t,s0)
- HOME_DIR/\.razor(/.*)? gen_context(system_u:object_r:razor_home_t,s0)
-
- /etc/razor(/.*)? gen_context(system_u:object_r:razor_etc_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.if serefpolicy-3.7.15/policy/modules/services/razor.if
---- nsaserefpolicy/policy/modules/services/razor.if 2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/razor.if 2010-03-18 10:44:43.000000000 -0400
-@@ -157,3 +157,45 @@
-
- domtrans_pattern($1, razor_exec_t, razor_t)
- ')
-+
-+########################################
-+##
-+## Create, read, write, and delete razor files
-+## in a user home subdirectory.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+template(`razor_manage_user_home_files',`
-+ gen_require(`
-+ type razor_home_t;
-+ ')
-+
-+ files_search_home($1)
-+ userdom_search_user_home_dirs($1)
-+ manage_files_pattern($1, razor_home_t, razor_home_t)
-+ read_lnk_files_pattern($1, razor_home_t, razor_home_t)
-+')
-+
-+########################################
-+##
-+## read razor lib files.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`razor_read_lib_files',`
-+ gen_require(`
-+ type razor_var_lib_t;
-+ ')
-+
-+ files_search_var_lib($1)
-+ read_files_pattern($1, razor_var_lib_t, razor_var_lib_t)
-+')
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.te serefpolicy-3.7.15/policy/modules/services/razor.te
---- nsaserefpolicy/policy/modules/services/razor.te 2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/razor.te 2010-03-18 10:44:43.000000000 -0400
-@@ -6,6 +6,32 @@
- # Declarations
- #
-
-+ifdef(`distro_redhat',`
-+
-+ gen_require(`
-+ type spamc_t;
-+ type spamc_exec_t;
-+ type spamd_log_t;
-+ type spamd_spool_t;
-+ type spamd_var_lib_t;
-+ type spamd_etc_t;
-+ type spamc_home_t;
-+ type spamc_tmp_t;
-+ ')
-+
-+ typealias spamc_t alias razor_t;
-+ typealias spamc_exec_t alias razor_exec_t;
-+ typealias spamd_log_t alias razor_log_t;
-+ typealias spamd_var_lib_t alias razor_var_lib_t;
-+ typealias spamd_etc_t alias razor_etc_t;
-+ typealias spamc_home_t alias razor_home_t;
-+ typealias spamc_home_t alias { user_razor_home_t staff_razor_home_t sysadm_razor_home_t };
-+ typealias spamc_home_t alias { auditadm_razor_home_t secadm_razor_home_t };
-+ typealias spamc_tmp_t alias { user_razor_tmp_t staff_razor_tmp_t sysadm_razor_tmp_t };
-+ typealias spamc_tmp_t alias { auditadm_razor_tmp_t secadm_razor_tmp_t };
-+
-+',`
-+
- type razor_exec_t;
- corecmd_executable_file(razor_exec_t)
-
-@@ -102,6 +128,8 @@
- manage_files_pattern(razor_t, razor_tmp_t, razor_tmp_t)
- files_tmp_filetrans(razor_t, razor_tmp_t, { file dir })
-
-+auth_use_nsswitch(razor_t)
-+
- logging_send_syslog_msg(razor_t)
-
- userdom_search_user_home_dirs(razor_t)
-@@ -120,5 +148,7 @@
- ')
-
- optional_policy(`
-- nscd_socket_use(razor_t)
-+ milter_manage_spamass_state(razor_t)
-+')
-+
- ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rdisc.if serefpolicy-3.7.15/policy/modules/services/rdisc.if
---- nsaserefpolicy/policy/modules/services/rdisc.if 2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/rdisc.if 2010-03-18 10:44:43.000000000 -0400
-@@ -1 +1,20 @@
- ## Network router discovery daemon
-+
-+######################################
-+##
-+## Execute rdisc in the caller domain.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`rdisc_exec',`
-+ gen_require(`
-+ type rdisc_exec_t;
-+ ')
-+
-+ corecmd_search_bin($1)
-+ can_exec($1,rdisc_exec_t)
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rgmanager.fc serefpolicy-3.7.15/policy/modules/services/rgmanager.fc
---- nsaserefpolicy/policy/modules/services/rgmanager.fc 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/rgmanager.fc 2010-03-18 10:44:43.000000000 -0400
-@@ -0,0 +1,8 @@
-+
-+/usr/sbin/rgmanager -- gen_context(system_u:object_r:rgmanager_exec_t,s0)
-+
-+/var/log/cluster/rgmanager\.log -- gen_context(system_u:object_r:rgmanager_var_log_t,s0)
-+
-+/var/run/rgmanager\.pid -- gen_context(system_u:object_r:rgmanager_var_run_t,s0)
-+
-+/var/run/cluster/rgmanager\.sk -s gen_context(system_u:object_r:rgmanager_var_run_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rgmanager.if serefpolicy-3.7.15/policy/modules/services/rgmanager.if
---- nsaserefpolicy/policy/modules/services/rgmanager.if 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/rgmanager.if 2010-03-18 10:44:43.000000000 -0400
-@@ -0,0 +1,98 @@
-+## SELinux policy for rgmanager
-+
-+#######################################
-+##
-+## Execute a domain transition to run rgmanager.
-+##
-+##
-+##
-+## Domain allowed to transition.
-+##
-+##
-+#
-+interface(`rgmanager_domtrans',`
-+ gen_require(`
-+ type rgmanager_t, rgmanager_exec_t;
-+ ')
-+
-+ corecmd_search_bin($1)
-+ domtrans_pattern($1,rgmanager_exec_t,rgmanager_t)
-+
-+')
-+
-+#######################################
-+##
-+## Allow read and write access to rgmanager semaphores.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`rgmanager_rw_semaphores',`
-+ gen_require(`
-+ type rgmanager_t;
-+ ')
-+
-+ allow $1 rgmanager_t:sem { unix_read unix_write associate read write };
-+')
-+
-+########################################
-+##
-+## Connect to rgmanager over an unix stream socket.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`rgmanager_stream_connect',`
-+ gen_require(`
-+ type rgmanager_t, rgmanager_var_run_t;
-+ ')
-+
-+ files_search_pids($1)
-+ stream_connect_pattern($1, rgmanager_var_run_t, rgmanager_var_run_t, rgmanager_t)
-+')
-+
-+######################################
-+##
-+## Allow manage rgmanager tmpfs files.
-+##
-+##
-+##
-+## The type of the process performing this action.
-+##
-+##
-+#
-+interface(`rgmanager_manage_tmpfs_files',`
-+ gen_require(`
-+ type rgmanager_tmpfs_t;
-+ ')
-+
-+ fs_search_tmpfs($1)
-+ manage_files_pattern($1, rgmanager_tmpfs_t, rgmanager_tmpfs_t)
-+ manage_lnk_files_pattern($1, rgmanager_tmpfs_t, rgmanager_tmpfs_t)
-+')
-+
-+######################################
-+##
-+## Allow manage rgmanager tmp files.
-+##
-+##
-+##
-+## The type of the process performing this action.
-+##
-+##
-+#
-+interface(`rgmanager_manage_tmp_files',`
-+ gen_require(`
-+ type rgmanager_tmp_t;
-+ ')
-+
-+ files_search_tmp($1)
-+ manage_files_pattern($1, rgmanager_tmp_t, rgmanager_tmp_t)
-+ manage_lnk_files_pattern($1, rgmanager_tmp_t, rgmanager_tmp_t)
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rgmanager.te serefpolicy-3.7.15/policy/modules/services/rgmanager.te
---- nsaserefpolicy/policy/modules/services/rgmanager.te 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/rgmanager.te 2010-03-18 10:44:43.000000000 -0400
-@@ -0,0 +1,223 @@
-+
-+policy_module(rgmanager,1.0.0)
-+
-+########################################
-+#
-+# Declarations
-+#
-+
-+##
-+##
-+## Allow rgmanager domain to connect to the network using TCP.
-+##
-+##
-+gen_tunable(rgmanager_can_network_connect, false)
-+
-+type rgmanager_t;
-+type rgmanager_exec_t;
-+domain_type(rgmanager_t)
-+init_daemon_domain(rgmanager_t, rgmanager_exec_t)
-+
-+# tmp files
-+type rgmanager_tmp_t;
-+files_tmp_file(rgmanager_tmp_t)
-+
-+type rgmanager_tmpfs_t;
-+files_tmpfs_file(rgmanager_tmpfs_t)
-+
-+# log files
-+type rgmanager_var_log_t;
-+logging_log_file(rgmanager_var_log_t)
-+
-+# pid files
-+type rgmanager_var_run_t;
-+files_pid_file(rgmanager_var_run_t)
-+
-+########################################
-+#
-+# rgmanager local policy
-+#
-+
-+allow rgmanager_t self:capability { dac_override net_raw sys_resource sys_admin sys_nice ipc_lock };
-+dontaudit rgmanager_t self:capability { sys_ptrace };
-+allow rgmanager_t self:process { setsched signal };
-+dontaudit rgmanager_t self:process { ptrace };
-+
-+allow rgmanager_t self:fifo_file rw_fifo_file_perms;
-+allow rgmanager_t self:unix_stream_socket { create_stream_socket_perms };
-+allow rgmanager_t self:unix_dgram_socket create_socket_perms;
-+allow rgmanager_t self:tcp_socket create_stream_socket_perms;
-+
-+# tmp files
-+manage_dirs_pattern(rgmanager_t, rgmanager_tmp_t, rgmanager_tmp_t)
-+manage_files_pattern(rgmanager_t, rgmanager_tmp_t, rgmanager_tmp_t)
-+files_tmp_filetrans(rgmanager_t, rgmanager_tmp_t, { file dir })
-+
-+manage_dirs_pattern(rgmanager_t, rgmanager_tmpfs_t, rgmanager_tmpfs_t)
-+manage_files_pattern(rgmanager_t, rgmanager_tmpfs_t, rgmanager_tmpfs_t)
-+fs_tmpfs_filetrans(rgmanager_t, rgmanager_tmpfs_t,{ dir file })
-+
-+# log files
-+manage_files_pattern(rgmanager_t, rgmanager_var_log_t,rgmanager_var_log_t)
-+logging_log_filetrans(rgmanager_t,rgmanager_var_log_t,{ file })
-+
-+# pid file
-+manage_files_pattern(rgmanager_t, rgmanager_var_run_t,rgmanager_var_run_t)
-+manage_sock_files_pattern(rgmanager_t, rgmanager_var_run_t, rgmanager_var_run_t)
-+files_pid_filetrans(rgmanager_t,rgmanager_var_run_t, { file sock_file })
-+
-+corecmd_exec_bin(rgmanager_t)
-+corecmd_exec_shell(rgmanager_t)
-+consoletype_exec(rgmanager_t)
-+
-+kernel_kill(rgmanager_t)
-+kernel_read_kernel_sysctls(rgmanager_t)
-+kernel_read_rpc_sysctls(rgmanager_t)
-+kernel_read_system_state(rgmanager_t)
-+kernel_rw_rpc_sysctls(rgmanager_t)
-+kernel_search_debugfs(rgmanager_t)
-+kernel_search_network_state(rgmanager_t)
-+
-+fs_getattr_xattr_fs(rgmanager_t)
-+
-+# need to write to /dev/misc/dlm-control
-+dev_rw_dlm_control(rgmanager_t)
-+dev_setattr_dlm_control(rgmanager_t)
-+dev_search_sysfs(rgmanager_t)
-+
-+domain_read_all_domains_state(rgmanager_t)
-+domain_getattr_all_domains(rgmanager_t)
-+domain_dontaudit_ptrace_all_domains(rgmanager_t)
-+
-+storage_getattr_fixed_disk_dev(rgmanager_t)
-+
-+# needed by resources scripts
-+auth_read_all_files_except_shadow(rgmanager_t)
-+auth_dontaudit_getattr_shadow(rgmanager_t)
-+
-+files_list_all(rgmanager_t)
-+files_getattr_all_symlinks(rgmanager_t)
-+files_manage_mnt_dirs(rgmanager_t)
-+files_manage_isid_type_dirs(rgmanager_t)
-+
-+files_create_var_run_dirs(rgmanager_t)
-+
-+fs_getattr_all_fs(rgmanager_t)
-+
-+term_getattr_pty_fs(rgmanager_t)
-+#term_use_ptmx(rgmanager_t)
-+
-+auth_use_nsswitch(rgmanager_t)
-+
-+libs_use_ld_so(rgmanager_t)
-+libs_use_shared_libs(rgmanager_t)
-+
-+logging_send_syslog_msg(rgmanager_t)
-+
-+miscfiles_read_localization(rgmanager_t)
-+
-+mount_domtrans(rgmanager_t)
-+
-+tunable_policy(`rgmanager_can_network_connect',`
-+ corenet_tcp_connect_all_ports(rgmanager_t)
-+')
-+
-+# rgmanager can run resource scripts
-+optional_policy(`
-+ aisexec_stream_connect(rgmanager_t)
-+ corosync_stream_connect(rgmanager_t)
-+')
-+
-+optional_policy(`
-+ apache_domtrans(rgmanager_t)
-+ apache_signal(rgmanager_t)
-+')
-+
-+optional_policy(`
-+ fstools_domtrans(rgmanager_t)
-+')
-+
-+optional_policy(`
-+ groupd_stream_connect(rgmanager_t)
-+')
-+
-+optional_policy(`
-+ hostname_exec(rgmanager_t)
-+')
-+
-+optional_policy(`
-+ ccs_manage_config(rgmanager_t)
-+ ccs_stream_connect(rgmanager_t)
-+ gfs_controld_stream_connect(rgmanager_t)
-+')
-+
-+optional_policy(`
-+ lvm_domtrans(rgmanager_t)
-+')
-+
-+optional_policy(`
-+ ldap_initrc_domtrans(rgmanager_t)
-+ ldap_domtrans(rgmanager_t)
-+')
-+
-+optional_policy(`
-+ mysql_domtrans_mysql_safe(rgmanager_t)
-+ mysql_stream_connect(rgmanager_t)
-+')
-+
-+optional_policy(`
-+ netutils_domtrans(rgmanager_t)
-+ netutils_domtrans_ping(rgmanager_t)
-+')
-+
-+optional_policy(`
-+ postgresql_domtrans(rgmanager_t)
-+ postgresql_signal(rgmanager_t)
-+')
-+
-+optional_policy(`
-+ rdisc_exec(rgmanager_t)
-+')
-+
-+optional_policy(`
-+ ricci_dontaudit_rw_modcluster_pipes(rgmanager_t)
-+')
-+
-+optional_policy(`
-+ rpc_initrc_domtrans_nfsd(rgmanager_t)
-+ rpc_initrc_domtrans_rpcd(rgmanager_t)
-+
-+ rpc_domtrans_nfsd(rgmanager_t)
-+ rpc_domtrans_rpcd(rgmanager_t)
-+ rpc_manage_nfs_state_data(rgmanager_t)
-+')
-+
-+optional_policy(`
-+ samba_initrc_domtrans(rgmanager_t)
-+ samba_domtrans_smbd(rgmanager_t)
-+ samba_domtrans_nmbd(rgmanager_t)
-+ samba_manage_var_files(rgmanager_t)
-+ samba_rw_config(rgmanager_t)
-+ samba_signal_smbd(rgmanager_t)
-+ samba_signal_nmbd(rgmanager_t)
-+')
-+
-+optional_policy(`
-+ sysnet_domtrans_ifconfig(rgmanager_t)
-+')
-+
-+optional_policy(`
-+ udev_read_db(rgmanager_t)
-+')
-+
-+optional_policy(`
-+ virt_stream_connect(rgmanager_t)
-+')
-+
-+optional_policy(`
-+ unconfined_domain(rgmanager_t)
-+')
-+
-+optional_policy(`
-+ xen_domtrans_xm(rgmanager_t)
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rhcs.fc serefpolicy-3.7.15/policy/modules/services/rhcs.fc
---- nsaserefpolicy/policy/modules/services/rhcs.fc 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/rhcs.fc 2010-03-18 10:44:43.000000000 -0400
-@@ -0,0 +1,23 @@
-+/usr/sbin/dlm_controld -- gen_context(system_u:object_r:dlm_controld_exec_t,s0)
-+/var/log/cluster/dlm_controld\.log.* -- gen_context(system_u:object_r:dlm_controld_var_log_t,s0)
-+/var/run/dlm_controld\.pid -- gen_context(system_u:object_r:dlm_controld_var_run_t,s0)
-+
-+/usr/sbin/fenced -- gen_context(system_u:object_r:fenced_exec_t,s0)
-+/usr/sbin/fence_node -- gen_context(system_u:object_r:fenced_exec_t,s0)
-+/var/lock/fence_manual\.lock -- gen_context(system_u:object_r:fenced_lock_t,s0)
-+/var/log/cluster/fenced\.log.* -- gen_context(system_u:object_r:fenced_var_log_t,s0)
-+/var/run/fenced\.pid -- gen_context(system_u:object_r:fenced_var_run_t,s0)
-+/var/run/cluster/fenced_override -- gen_context(system_u:object_r:fenced_var_run_t,s0)
-+
-+/usr/sbin/gfs_controld -- gen_context(system_u:object_r:gfs_controld_exec_t,s0)
-+/var/log/cluster/gfs_controld\.log.* -- gen_context(system_u:object_r:gfs_controld_var_log_t,s0)
-+/var/run/gfs_controld\.pid -- gen_context(system_u:object_r:gfs_controld_var_run_t,s0)
-+
-+/usr/sbin/groupd -- gen_context(system_u:object_r:groupd_exec_t,s0)
-+/var/run/groupd\.pid -- gen_context(system_u:object_r:groupd_var_run_t,s0)
-+
-+/usr/sbin/qdiskd -- gen_context(system_u:object_r:qdiskd_exec_t,s0)
-+/var/lib/qdiskd(/.*)? gen_context(system_u:object_r:qdiskd_var_lib_t,s0)
-+/var/log/cluster/qdiskd\.log.* -- gen_context(system_u:object_r:qdiskd_var_log_t,s0)
-+/var/run/qdiskd\.pid -- gen_context(system_u:object_r:qdiskd_var_run_t,s0)
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rhcs.if serefpolicy-3.7.15/policy/modules/services/rhcs.if
---- nsaserefpolicy/policy/modules/services/rhcs.if 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/rhcs.if 2010-03-18 10:44:43.000000000 -0400
-@@ -0,0 +1,424 @@
-+## SELinux policy for RHCS - Red Hat Cluster Suite
-+
-+#######################################
-+##
-+## Creates types and rules for a basic
-+## rhcs init daemon domain.
-+##
-+##
-+##
-+## Prefix for the domain.
-+##
-+##
-+#
-+template(`rhcs_domain_template',`
-+
-+ gen_require(`
-+ attribute cluster_domain;
-+ ')
-+
-+ ##############################
-+ #
-+ # $1_t declarations
-+ #
-+
-+ type $1_t, cluster_domain;
-+ type $1_exec_t;
-+ init_daemon_domain($1_t, $1_exec_t)
-+
-+ type $1_tmpfs_t;
-+ files_tmpfs_file($1_tmpfs_t)
-+
-+ # log files
-+ type $1_var_log_t;
-+ logging_log_file($1_var_log_t)
-+
-+ # pid files
-+ type $1_var_run_t;
-+ files_pid_file($1_var_run_t)
-+
-+ ##############################
-+ #
-+ # $1_t local policy
-+ #
-+
-+ manage_dirs_pattern($1_t, $1_tmpfs_t, $1_tmpfs_t)
-+ manage_files_pattern($1_t, $1_tmpfs_t, $1_tmpfs_t)
-+ fs_tmpfs_filetrans($1_t, $1_tmpfs_t,{ dir file })
-+
-+ manage_files_pattern($1_t, $1_var_run_t, $1_var_run_t)
-+ manage_fifo_files_pattern($1_t, $1_var_run_t, $1_var_run_t)
-+ manage_sock_files_pattern($1_t, $1_var_run_t, $1_var_run_t)
-+ files_pid_filetrans($1_t, $1_var_run_t, { file fifo_file })
-+
-+ manage_files_pattern($1_t, $1_var_log_t,$1_var_log_t)
-+ manage_sock_files_pattern($1_t, $1_var_log_t,$1_var_log_t)
-+ logging_log_filetrans($1_t,$1_var_log_t,{ file sock_file })
-+
-+')
-+
-+######################################
-+##
-+## Execute a domain transition to run groupd.
-+##
-+##
-+##
-+## Domain allowed to transition.
-+##
-+##
-+#
-+interface(`groupd_domtrans',`
-+ gen_require(`
-+ type groupd_t, groupd_exec_t;
-+ ')
-+
-+ corecmd_search_bin($1)
-+ domtrans_pattern($1,groupd_exec_t,groupd_t)
-+')
-+
-+#####################################
-+##
-+## Connect to groupd over a unix domain
-+## stream socket.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`groupd_stream_connect',`
-+ gen_require(`
-+ type groupd_t, groupd_var_run_t;
-+ ')
-+
-+ files_search_pids($1)
-+ stream_connect_pattern($1, groupd_var_run_t, groupd_var_run_t, groupd_t)
-+')
-+
-+#####################################
-+##
-+## Manage groupd tmpfs files.
-+##
-+##
-+##
-+## The type of the process performing this action.
-+##
-+##
-+#
-+interface(`groupd_manage_tmpfs_files',`
-+ gen_require(`
-+ type groupd_tmpfs_t;
-+ ')
-+
-+ fs_search_tmpfs($1)
-+ manage_files_pattern($1, groupd_tmpfs_t, groupd_tmpfs_t)
-+ manage_lnk_files_pattern($1, groupd_tmpfs_t, groupd_tmpfs_t)
-+')
-+
-+#####################################
-+##
-+## Allow read and write access to groupd semaphores.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`groupd_rw_semaphores',`
-+ gen_require(`
-+ type groupd_t;
-+ ')
-+
-+ allow $1 groupd_t:sem { rw_sem_perms destroy };
-+')
-+
-+########################################
-+##
-+## Read and write to group shared memory.
-+##
-+##
-+##
-+## The type of the process performing this action.
-+##
-+##
-+#
-+interface(`groupd_rw_shm',`
-+ gen_require(`
-+ type groupd_t;
-+ ')
-+
-+ allow $1 groupd_t:shm { rw_shm_perms destroy };
-+')
-+
-+######################################
-+##
-+## Execute a domain transition to run dlm_controld.
-+##
-+##
-+##
-+## Domain allowed to transition.
-+##
-+##
-+#
-+interface(`dlm_controld_domtrans',`
-+ gen_require(`
-+ type dlm_controld_t, dlm_controld_exec_t;
-+ ')
-+
-+ corecmd_search_bin($1)
-+ domtrans_pattern($1,dlm_controld_exec_t,dlm_controld_t)
-+
-+')
-+
-+#####################################
-+##
-+## Connect to dlm_controld over a unix domain
-+## stream socket.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`dlm_controld_stream_connect',`
-+ gen_require(`
-+ type dlm_controld_t, dlm_controld_var_run_t;
-+ ')
-+
-+ files_search_pids($1)
-+ stream_connect_pattern($1, dlm_controld_var_run_t, dlm_controld_var_run_t, dlm_controld_t)
-+')
-+
-+#####################################
-+##
-+## Manage dlm_controld tmpfs files.
-+##
-+##
-+##
-+## The type of the process performing this action.
-+##
-+##
-+#
-+interface(`dlm_controld_manage_tmpfs_files',`
-+ gen_require(`
-+ type dlm_controld_tmpfs_t;
-+ ')
-+
-+ fs_search_tmpfs($1)
-+ manage_files_pattern($1, dlm_controld_tmpfs_t, dlm_controld_tmpfs_t)
-+ manage_lnk_files_pattern($1, dlm_controld_tmpfs_t, dlm_controld_tmpfs_t)
-+')
-+
-+#####################################
-+##
-+## Allow read and write access to dlm_controld semaphores.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`dlm_controld_rw_semaphores',`
-+ gen_require(`
-+ type dlm_controld_t;
-+ ')
-+
-+ allow $1 dlm_controld_t:sem { rw_sem_perms destroy };
-+')
-+
-+######################################
-+##
-+## Execute a domain transition to run fenced.
-+##
-+##
-+##
-+## Domain allowed to transition.
-+##
-+##
-+#
-+interface(`fenced_domtrans',`
-+ gen_require(`
-+ type fenced_t, fenced_exec_t;
-+ ')
-+
-+ corecmd_search_bin($1)
-+ domtrans_pattern($1,fenced_exec_t,fenced_t)
-+
-+')
-+
-+######################################
-+##
-+## Connect to fenced over an unix domain stream socket.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`fenced_stream_connect',`
-+ gen_require(`
-+ type fenced_var_run_t, fenced_t;
-+ ')
-+
-+ allow $1 fenced_t:unix_stream_socket connectto;
-+ allow $1 fenced_var_run_t:sock_file { getattr write };
-+ files_search_pids($1)
-+')
-+
-+#####################################
-+##
-+## Managed fenced tmpfs files.
-+##
-+##
-+##
-+## The type of the process performing this action.
-+##
-+##
-+#
-+interface(`fenced_manage_tmpfs_files',`
-+ gen_require(`
-+ type fenced_tmpfs_t;
-+ ')
-+
-+ fs_search_tmpfs($1)
-+ manage_files_pattern($1, fenced_tmpfs_t, fenced_tmpfs_t)
-+ manage_lnk_files_pattern($1, fenced_tmpfs_t, fenced_tmpfs_t)
-+')
-+
-+######################################
-+##
-+## Allow read and write access to fenced semaphores.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`fenced_rw_semaphores',`
-+ gen_require(`
-+ type fenced_t;
-+ ')
-+
-+ allow $1 fenced_t:sem { rw_sem_perms destroy };
-+')
-+
-+#####################################
-+##
-+## Execute a domain transition to run gfs_controld.
-+##
-+##
-+##
-+## Domain allowed to transition.
-+##
-+##
-+#
-+interface(`gfs_controld_domtrans',`
-+ gen_require(`
-+ type gfs_controld_t, gfs_controld_exec_t;
-+ ')
-+
-+ corecmd_search_bin($1)
-+ domtrans_pattern($1,gfs_controld_exec_t,gfs_controld_t)
-+')
-+
-+###################################
-+##
-+## Manage gfs_controld tmpfs files.
-+##
-+##
-+##
-+## The type of the process performing this action.
-+##
-+##
-+#
-+interface(`gfs_controld_manage_tmpfs_files',`
-+ gen_require(`
-+ type gfs_controld_tmpfs_t;
-+ ')
-+
-+ fs_search_tmpfs($1)
-+ manage_files_pattern($1, gfs_controld_tmpfs_t, gfs_controld_tmpfs_t)
-+ manage_lnk_files_pattern($1, gfs_controld_tmpfs_t, gfs_controld_tmpfs_t)
-+')
-+
-+####################################
-+##
-+## Allow read and write access to gfs_controld semaphores.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`gfs_controld_rw_semaphores',`
-+ gen_require(`
-+ type gfs_controld_t;
-+ ')
-+
-+ allow $1 gfs_controld_t:sem { rw_sem_perms destroy };
-+')
-+
-+########################################
-+##
-+## Read and write to gfs_controld_t shared memory.
-+##
-+##
-+##
-+## The type of the process performing this action.
-+##
-+##
-+#
-+interface(`gfs_controld_t_rw_shm',`
-+ gen_require(`
-+ type gfs_controld_t;
-+ ')
-+
-+ allow $1 gfs_controld_t:shm { rw_shm_perms destroy };
-+')
-+
-+#####################################
-+##
-+## Connect to gfs_controld_t over an unix domain stream socket.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`gfs_controld_stream_connect',`
-+ gen_require(`
-+ type gfs_controld_t, gfs_controld_var_run_t;
-+ ')
-+
-+ files_search_pids($1)
-+ stream_connect_pattern($1, gfs_controld_var_run_t, gfs_controld_var_run_t, gfs_controld_t)
-+')
-+
-+######################################
-+##
-+## Execute a domain transition to run qdiskd.
-+##
-+##
-+##
-+## Domain allowed to transition.
-+##
-+##
-+#
-+interface(`qdiskd_domtrans',`
-+ gen_require(`
-+ type qdiskd_t, qdiskd_exec_t;
-+ ')
-+
-+ corecmd_search_bin($1)
-+ domtrans_pattern($1,qdiskd_exec_t,qdiskd_t)
-+')
-+
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rhcs.te serefpolicy-3.7.15/policy/modules/services/rhcs.te
---- nsaserefpolicy/policy/modules/services/rhcs.te 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/rhcs.te 2010-03-18 10:44:43.000000000 -0400
-@@ -0,0 +1,248 @@
-+
-+policy_module(rhcs,1.1.0)
-+
-+########################################
-+#
-+# Declarations
-+#
-+
-+##
-+##
-+## Allow fenced domain to connect to the network using TCP.
-+##
-+##
-+gen_tunable(fenced_can_network_connect, false)
-+
-+attribute cluster_domain;
-+
-+rhcs_domain_template(dlm_controld)
-+
-+rhcs_domain_template(fenced)
-+
-+# tmp files
-+type fenced_tmp_t;
-+files_tmp_file(fenced_tmp_t)
-+
-+type fenced_lock_t;
-+files_lock_file(fenced_lock_t)
-+
-+rhcs_domain_template(gfs_controld)
-+
-+rhcs_domain_template(groupd)
-+
-+rhcs_domain_template(qdiskd)
-+
-+# var/lib files
-+type qdiskd_var_lib_t;
-+files_type(qdiskd_var_lib_t)
-+
-+#####################################
-+#
-+# dlm_controld local policy
-+#
-+
-+allow dlm_controld_t self:capability { net_admin sys_admin sys_resource };
-+
-+allow dlm_controld_t self:netlink_kobject_uevent_socket create_socket_perms;
-+
-+stream_connect_pattern(dlm_controld_t, fenced_var_run_t, fenced_var_run_t, fenced_t)
-+stream_connect_pattern(dlm_controld_t, groupd_var_run_t, groupd_var_run_t, groupd_t)
-+
-+kernel_read_system_state(dlm_controld_t)
-+
-+dev_rw_dlm_control(dlm_controld_t)
-+dev_rw_sysfs(dlm_controld_t)
-+
-+fs_manage_configfs_files(dlm_controld_t)
-+fs_manage_configfs_dirs(dlm_controld_t)
-+
-+init_rw_script_tmp_files(dlm_controld_t)
-+
-+optional_policy(`
-+ ccs_stream_connect(dlm_controld_t)
-+')
-+
-+#######################################
-+#
-+# fenced local policy
-+#
-+
-+allow fenced_t self:capability { sys_rawio sys_resource };
-+allow fenced_t self:process getsched;
-+
-+allow fenced_t self:tcp_socket create_stream_socket_perms;
-+allow fenced_t self:udp_socket create_socket_perms;
-+
-+can_exec(fenced_t,fenced_exec_t)
-+
-+# tmp files
-+manage_dirs_pattern(fenced_t, fenced_tmp_t, fenced_tmp_t)
-+manage_files_pattern(fenced_t, fenced_tmp_t, fenced_tmp_t)
-+manage_fifo_files_pattern(fenced_t, fenced_tmp_t, fenced_tmp_t)
-+files_tmp_filetrans(fenced_t, fenced_tmp_t, { file fifo_file dir })
-+
-+manage_files_pattern(fenced_t, fenced_lock_t, fenced_lock_t)
-+files_lock_filetrans(fenced_t,fenced_lock_t,file)
-+
-+stream_connect_pattern(fenced_t, groupd_var_run_t, groupd_var_run_t, groupd_t)
-+
-+corecmd_exec_bin(fenced_t)
-+
-+dev_read_sysfs(fenced_t)
-+dev_read_urand(fenced_t)
-+
-+storage_raw_read_fixed_disk(fenced_t)
-+storage_raw_write_fixed_disk(fenced_t)
-+storage_raw_read_removable_device(fenced_t)
-+
-+term_getattr_pty_fs(fenced_t)
-+term_use_ptmx(fenced_t)
-+
-+auth_use_nsswitch(fenced_t)
-+
-+files_read_usr_symlinks(fenced_t)
-+
-+corenet_tcp_connect_http_port(fenced_t)
-+tunable_policy(`fenced_can_network_connect',`
-+ corenet_tcp_connect_all_ports(fenced_t)
-+')
-+
-+optional_policy(`
-+ ccs_read_config(fenced_t)
-+ ccs_stream_connect(fenced_t)
-+')
-+
-+optional_policy(`
-+ lvm_domtrans(fenced_t)
-+ lvm_read_config(fenced_t)
-+')
-+
-+######################################
-+#
-+# gfs_controld local policy
-+#
-+
-+allow gfs_controld_t self:capability { net_admin sys_resource };
-+
-+allow gfs_controld_t self:shm create_shm_perms;
-+allow gfs_controld_t self:netlink_kobject_uevent_socket create_socket_perms;
-+
-+stream_connect_pattern(gfs_controld_t, dlm_controld_var_run_t, dlm_controld_var_run_t, dlm_controld_t)
-+stream_connect_pattern(gfs_controld_t, fenced_var_run_t, fenced_var_run_t, fenced_t)
-+stream_connect_pattern(gfs_controld_t, groupd_var_run_t, groupd_var_run_t, groupd_t)
-+
-+kernel_read_system_state(gfs_controld_t)
-+
-+storage_getattr_removable_dev(gfs_controld_t)
-+
-+dev_rw_dlm_control(gfs_controld_t)
-+dev_setattr_dlm_control(gfs_controld_t)
-+
-+dev_rw_sysfs(gfs_controld_t)
-+
-+init_rw_script_tmp_files(gfs_controld_t)
-+
-+optional_policy(`
-+ ccs_stream_connect(gfs_controld_t)
-+')
-+
-+optional_policy(`
-+ lvm_exec(gfs_controld_t)
-+ dev_rw_lvm_control(gfs_controld_t)
-+')
-+
-+#######################################
-+#
-+# groupd local policy
-+#
-+
-+allow groupd_t self:capability { sys_nice sys_resource };
-+allow groupd_t self:process setsched;
-+
-+allow groupd_t self:shm create_shm_perms;
-+
-+dev_list_sysfs(groupd_t)
-+
-+files_read_etc_files(groupd_t)
-+
-+init_rw_script_tmp_files(groupd_t)
-+
-+######################################
-+#
-+# qdiskd local policy
-+#
-+
-+allow qdiskd_t self:capability ipc_lock;
-+
-+allow qdiskd_t self:tcp_socket create_stream_socket_perms;
-+allow qdiskd_t self:udp_socket create_socket_perms;
-+
-+manage_files_pattern(qdiskd_t, qdiskd_var_lib_t,qdiskd_var_lib_t)
-+manage_dirs_pattern(qdiskd_t, qdiskd_var_lib_t,qdiskd_var_lib_t)
-+manage_sock_files_pattern(qdiskd_t, qdiskd_var_lib_t,qdiskd_var_lib_t)
-+files_var_lib_filetrans(qdiskd_t,qdiskd_var_lib_t, { file dir sock_file })
-+
-+corecmd_getattr_bin_files(qdiskd_t)
-+corecmd_exec_shell(qdiskd_t)
-+
-+kernel_read_system_state(qdiskd_t)
-+kernel_read_software_raid_state(qdiskd_t)
-+kernel_getattr_core_if(qdiskd_t)
-+
-+dev_read_sysfs(qdiskd_t)
-+dev_list_all_dev_nodes(qdiskd_t)
-+dev_getattr_all_blk_files(qdiskd_t)
-+dev_getattr_all_chr_files(qdiskd_t)
-+dev_manage_generic_blk_files(qdiskd_t)
-+dev_manage_generic_chr_files(qdiskd_t)
-+
-+storage_raw_read_removable_device(qdiskd_t)
-+storage_raw_write_removable_device(qdiskd_t)
-+storage_raw_read_fixed_disk(qdiskd_t)
-+storage_raw_write_fixed_disk(qdiskd_t)
-+
-+domain_dontaudit_getattr_all_pipes(qdiskd_t)
-+domain_dontaudit_getattr_all_sockets(qdiskd_t)
-+
-+files_dontaudit_getattr_all_sockets(qdiskd_t)
-+files_dontaudit_getattr_all_pipes(qdiskd_t)
-+
-+auth_use_nsswitch(qdiskd_t)
-+
-+files_read_etc_files(qdiskd_t)
-+
-+optional_policy(`
-+ ccs_stream_connect(qdiskd_t)
-+')
-+
-+optional_policy(`
-+ netutils_domtrans_ping(qdiskd_t)
-+')
-+
-+optional_policy(`
-+ udev_read_db(qdiskd_t)
-+')
-+
-+#####################################
-+#
-+# rhcs domains common policy
-+#
-+
-+allow cluster_domain self:capability { sys_nice };
-+allow cluster_domain self:process setsched;
-+
-+allow cluster_domain self:sem create_sem_perms;
-+allow cluster_domain self:fifo_file rw_fifo_file_perms;
-+allow cluster_domain self:unix_stream_socket create_stream_socket_perms;
-+allow cluster_domain self:unix_dgram_socket create_socket_perms;
-+
-+libs_use_ld_so(cluster_domain)
-+libs_use_shared_libs(cluster_domain)
-+
-+logging_send_syslog_msg(cluster_domain)
-+
-+miscfiles_read_localization(cluster_domain)
-+
-+optional_policy(`
-+ corosync_stream_connect(cluster_domain)
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.te serefpolicy-3.7.15/policy/modules/services/ricci.te
---- nsaserefpolicy/policy/modules/services/ricci.te 2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/ricci.te 2010-03-18 10:44:43.000000000 -0400
-@@ -194,10 +194,13 @@
- # ricci_modcluster local policy
- #
-
--allow ricci_modcluster_t self:capability sys_nice;
-+allow ricci_modcluster_t self:capability { net_bind_service sys_nice };
- allow ricci_modcluster_t self:process setsched;
- allow ricci_modcluster_t self:fifo_file rw_fifo_file_perms;
-
-+corenet_tcp_bind_cluster_port(ricci_modclusterd_t)
-+corenet_tcp_bind_reserved_port(ricci_modclusterd_t)
-+
- kernel_read_kernel_sysctls(ricci_modcluster_t)
- kernel_read_system_state(ricci_modcluster_t)
-
-@@ -227,6 +230,11 @@
- ricci_stream_connect_modclusterd(ricci_modcluster_t)
-
- optional_policy(`
-+ aisexec_stream_connect(ricci_modcluster_t)
-+ corosync_stream_connect(ricci_modcluster_t)
-+')
-+
-+optional_policy(`
- ccs_stream_connect(ricci_modcluster_t)
- ccs_domtrans(ricci_modcluster_t)
- ccs_manage_config(ricci_modcluster_t)
-@@ -245,6 +253,10 @@
- ')
-
- optional_policy(`
-+ rgmanager_stream_connect(ricci_modclusterd_t)
-+')
-+
-+optional_policy(`
- # XXX This has got to go.
- unconfined_domain(ricci_modcluster_t)
- ')
-@@ -259,11 +271,11 @@
- allow ricci_modclusterd_t self:fifo_file rw_fifo_file_perms;
- allow ricci_modclusterd_t self:unix_stream_socket create_stream_socket_perms;
- allow ricci_modclusterd_t self:tcp_socket create_stream_socket_perms;
--allow ricci_modclusterd_t self:netlink_route_socket r_netlink_socket_perms;
- # cjp: this needs to be fixed for a specific socket type:
- allow ricci_modclusterd_t self:socket create_socket_perms;
-
- allow ricci_modclusterd_t ricci_modcluster_t:unix_stream_socket connectto;
-+allow ricci_modclusterd_t ricci_modcluster_t:fifo_file rw_file_perms;
-
- # log files
- allow ricci_modclusterd_t ricci_modcluster_var_log_t:dir setattr;
-@@ -294,6 +306,8 @@
-
- fs_getattr_xattr_fs(ricci_modclusterd_t)
-
-+auth_use_nsswitch(ricci_modclusterd_t)
-+
- init_stream_connect_script(ricci_modclusterd_t)
-
- locallogin_dontaudit_use_fds(ricci_modclusterd_t)
-@@ -303,7 +317,11 @@
- miscfiles_read_localization(ricci_modclusterd_t)
-
- sysnet_domtrans_ifconfig(ricci_modclusterd_t)
--sysnet_dns_name_resolve(ricci_modclusterd_t)
-+
-+optional_policy(`
-+ aisexec_stream_connect(ricci_modclusterd_t)
-+ corosync_stream_connect(ricci_modclusterd_t)
-+')
-
- optional_policy(`
- ccs_domtrans(ricci_modclusterd_t)
-@@ -312,6 +330,10 @@
- ')
-
- optional_policy(`
-+ rgmanager_stream_connect(ricci_modclusterd_t)
-+')
-+
-+optional_policy(`
- unconfined_use_fds(ricci_modclusterd_t)
- ')
-
-@@ -440,6 +462,12 @@
- files_read_usr_files(ricci_modstorage_t)
- files_read_kernel_modules(ricci_modstorage_t)
-
-+files_create_default_dir(ricci_modstorage_t)
-+files_root_filetrans_default(ricci_modstorage_t, dir)
-+files_mounton_default(ricci_modstorage_t)
-+files_manage_default_dirs(ricci_modstorage_t)
-+files_manage_default_files(ricci_modstorage_t)
-+
- storage_raw_read_fixed_disk(ricci_modstorage_t)
-
- term_dontaudit_use_console(ricci_modstorage_t)
-@@ -457,6 +485,11 @@
- mount_domtrans(ricci_modstorage_t)
-
- optional_policy(`
-+ aisexec_stream_connect(ricci_modstorage_t)
-+ corosync_stream_connect(ricci_modstorage_t)
-+')
-+
-+optional_policy(`
- ccs_stream_connect(ricci_modstorage_t)
- ccs_read_config(ricci_modstorage_t)
- ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.fc serefpolicy-3.7.15/policy/modules/services/rpc.fc
---- nsaserefpolicy/policy/modules/services/rpc.fc 2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/rpc.fc 2010-03-18 10:44:43.000000000 -0400
-@@ -1,6 +1,10 @@
- #
- # /etc
- #
-+/etc/rc\.d/init\.d/nfs -- gen_context(system_u:object_r:nfsd_initrc_exec_t,s0)
-+/etc/rc\.d/init\.d/nfslock -- gen_context(system_u:object_r:rpcd_initrc_exec_t,s0)
-+/etc/rc\.d/init\.d/rpcidmapd -- gen_context(system_u:object_r:rpcd_initrc_exec_t,s0)
-+
- /etc/exports -- gen_context(system_u:object_r:exports_t,s0)
-
- #
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.if serefpolicy-3.7.15/policy/modules/services/rpc.if
---- nsaserefpolicy/policy/modules/services/rpc.if 2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/rpc.if 2010-03-18 10:44:43.000000000 -0400
-@@ -54,7 +54,7 @@
- allow $1_t self:unix_dgram_socket create_socket_perms;
- allow $1_t self:unix_stream_socket create_stream_socket_perms;
- allow $1_t self:tcp_socket create_stream_socket_perms;
-- allow $1_t self:udp_socket create_socket_perms;
-+ allow $1_t self:udp_socket create_stream_socket_perms;
-
- manage_dirs_pattern($1_t, var_lib_nfs_t, var_lib_nfs_t)
- manage_files_pattern($1_t, var_lib_nfs_t, var_lib_nfs_t)
-@@ -99,6 +99,7 @@
- files_read_etc_runtime_files($1_t)
- files_search_var($1_t)
- files_search_var_lib($1_t)
-+ files_list_home($1_t)
-
- auth_use_nsswitch($1_t)
-
-@@ -109,6 +110,10 @@
- userdom_dontaudit_use_unpriv_user_fds($1_t)
-
- optional_policy(`
-+ rpcbind_stream_connect($1_t)
-+ ')
-+
-+ optional_policy(`
- seutil_sigchld_newrole($1_t)
- ')
-
-@@ -204,7 +209,7 @@
- domtrans_pattern($1, nfsd_exec_t, nfsd_t)
- ')
-
--########################################
-+#######################################
- ##
- ## Execute domain in nfsd domain.
- ##
-@@ -214,6 +219,24 @@
- ##
- ##
- #
-+interface(`rpc_initrc_domtrans_nfsd',`
-+ gen_require(`
-+ type nfsd_initrc_exec_t;
-+ ')
-+
-+ init_labeled_script_domtrans($1, nfsd_initrc_exec_t)
-+')
-+
-+########################################
-+##
-+## Execute domain in rpcd domain.
-+##
-+##
-+##
-+## The type of the process performing this action.
-+##
-+##
-+#
- interface(`rpc_domtrans_rpcd',`
- gen_require(`
- type rpcd_t, rpcd_exec_t;
-@@ -223,6 +246,24 @@
- allow rpcd_t $1:process signal;
- ')
-
-+#######################################
-+##
-+## Execute domain in rpcd domain.
-+##
-+##
-+##
-+## The type of the process performing this action.
-+##
-+##
-+#
-+interface(`rpc_initrc_domtrans_rpcd',`
-+ gen_require(`
-+ type rpcd_initrc_exec_t;
-+ ')
-+
-+ init_labeled_script_domtrans($1, rpcd_initrc_exec_t)
-+')
-+
- ########################################
- ##
- ## Read NFS exported content.
-@@ -373,4 +414,5 @@
-
- files_search_var_lib($1)
- manage_files_pattern($1, var_lib_nfs_t, var_lib_nfs_t)
-+ allow $1 var_lib_nfs_t:file { relabelfrom relabelto };
- ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-3.7.15/policy/modules/services/rpc.te
---- nsaserefpolicy/policy/modules/services/rpc.te 2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/rpc.te 2010-03-18 10:44:43.000000000 -0400
-@@ -8,7 +8,7 @@
-
- ##
- ##
--## Allow gssd to read temp directory. For access to kerberos tgt.
-+## Allow gssd to read tep directory. For access to kerberos tgt.
- ##
- ##
- gen_tunable(allow_gssd_read_tmp, true)
-@@ -37,8 +37,14 @@
- # rpc_exec_t is the type of rpc daemon programs.
- rpc_domain_template(rpcd)
-
-+type rpcd_initrc_exec_t;
-+init_script_file(rpcd_initrc_exec_t);
-+
- rpc_domain_template(nfsd)
-
-+type nfsd_initrc_exec_t;
-+init_script_file(nfsd_initrc_exec_t);
-+
- type nfsd_rw_t;
- files_type(nfsd_rw_t)
-
-@@ -53,7 +59,8 @@
- # RPC local policy
- #
-
--allow rpcd_t self:capability { chown dac_override setgid setuid };
-+allow rpcd_t self:capability { sys_admin chown dac_override setgid setuid };
-+allow rpcd_t self:process { getcap setcap };
- allow rpcd_t self:fifo_file rw_fifo_file_perms;
-
- allow rpcd_t rpcd_var_run_t:dir setattr;
-@@ -67,12 +74,14 @@
- kernel_read_network_state(rpcd_t)
- # for rpc.rquotad
- kernel_read_sysctl(rpcd_t)
-+kernel_request_load_module(gssd_t)
- kernel_rw_fs_sysctls(rpcd_t)
- kernel_dontaudit_getattr_core_if(rpcd_t)
- kernel_signal(rpcd_t)
-
- corecmd_exec_bin(rpcd_t)
-
-+files_read_default_files(rpcd_t)
- files_manage_mounttab(rpcd_t)
- files_getattr_all_dirs(rpcd_t)
-
-@@ -91,14 +100,26 @@
-
- seutil_dontaudit_search_config(rpcd_t)
-
-+userdom_signal_unpriv_users(rpcd_t)
-+userdom_read_user_home_content_files(rpcd_t)
-+
- optional_policy(`
- automount_signal(rpcd_t)
-+ automount_dontaudit_write_pipes(rpcd_t)
-+')
-+
-+optional_policy(`
-+ domain_unconfined_signal(rpcd_t)
- ')
-
- optional_policy(`
- nis_read_ypserv_config(rpcd_t)
- ')
-
-+optional_policy(`
-+ rgmanager_manage_tmp_files(rpcd_t)
-+')
-+
- ########################################
- #
- # NFSD local policy
-@@ -127,6 +148,7 @@
- files_getattr_tmp_dirs(nfsd_t)
- # cjp: this should really have its own type
- files_manage_mounttab(nfsd_t)
-+files_read_etc_runtime_files(nfsd_t)
-
- fs_mount_nfsd_fs(nfsd_t)
- fs_search_nfsd_fs(nfsd_t)
-@@ -135,6 +157,7 @@
- fs_rw_nfsd_fs(nfsd_t)
-
- storage_dontaudit_read_fixed_disk(nfsd_t)
-+storage_raw_read_removable_device(nfsd_t)
-
- # Read access to public_content_t and public_content_rw_t
- miscfiles_read_public_files(nfsd_t)
-@@ -151,6 +174,7 @@
- fs_read_noxattr_fs_files(nfsd_t)
- auth_manage_all_files_except_shadow(nfsd_t)
- ')
-+userdom_user_home_dir_filetrans_user_home_content(nfsd_t, { file dir })
-
- tunable_policy(`nfs_export_all_ro',`
- dev_getattr_all_blk_files(nfsd_t)
-@@ -182,6 +206,7 @@
- kernel_read_network_state(gssd_t)
- kernel_read_network_state_symlinks(gssd_t)
- kernel_search_network_sysctl(gssd_t)
-+kernel_signal(gssd_t)
-
- corecmd_exec_bin(gssd_t)
-
-@@ -189,8 +214,10 @@
- fs_rw_rpc_sockets(gssd_t)
- fs_read_rpc_files(gssd_t)
-
-+fs_list_inotifyfs(gssd_t)
- files_list_tmp(gssd_t)
- files_read_usr_symlinks(gssd_t)
-+files_dontaudit_write_var_dirs(gssd_t)
-
- auth_use_nsswitch(gssd_t)
- auth_manage_cache(gssd_t)
-@@ -199,10 +226,14 @@
-
- mount_signal(gssd_t)
-
-+userdom_signal_all_users(gssd_t)
-+
- tunable_policy(`allow_gssd_read_tmp',`
- userdom_list_user_tmp(gssd_t)
- userdom_read_user_tmp_files(gssd_t)
- userdom_read_user_tmp_symlinks(gssd_t)
-+ userdom_dontaudit_write_user_tmp_files(gssd_t)
-+ files_read_generic_tmp_files(gssd_t)
- ')
-
- optional_policy(`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsync.if serefpolicy-3.7.15/policy/modules/services/rsync.if
---- nsaserefpolicy/policy/modules/services/rsync.if 2010-02-12 10:33:09.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/rsync.if 2010-03-18 10:44:43.000000000 -0400
-@@ -119,7 +119,7 @@
- type rsync_etc_t;
- ')
-
-- allow $1 rsync_etc_t:file read_file_perms;
-+ read_files_pattern($1, rsync_etc_t, rsync_etc_t)
- files_search_etc($1)
- ')
-
-@@ -138,6 +138,6 @@
- type rsync_etc_t;
- ')
-
-- allow $1 rsync_etc_t:file read_file_perms;
-+ write_files_pattern($1, rsync_etc_t, rsync_etc_t)
- files_search_etc($1)
- ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsync.te serefpolicy-3.7.15/policy/modules/services/rsync.te
---- nsaserefpolicy/policy/modules/services/rsync.te 2010-02-12 10:33:09.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/rsync.te 2010-03-18 10:44:43.000000000 -0400
-@@ -8,6 +8,13 @@
-
- ##
- ##
-+## Allow rsync to run as a client
-+##
-+##
-+gen_tunable(rsync_client, false)
-+
-+##
-+##
- ## Allow rsync to export any files/directories read only.
- ##
- ##
-@@ -24,7 +31,6 @@
-
- type rsync_t;
- type rsync_exec_t;
--init_daemon_domain(rsync_t, rsync_exec_t)
- application_executable_file(rsync_exec_t)
- role system_r types rsync_t;
-
-@@ -60,7 +66,7 @@
- allow rsync_t self:netlink_tcpdiag_socket r_netlink_socket_perms;
- #end for identd
-
--allow rsync_t rsync_etc_t:file read_file_perms;
-+read_files_pattern(rsync_t, rsync_etc_t, rsync_etc_t)
-
- allow rsync_t rsync_data_t:dir list_dir_perms;
- read_files_pattern(rsync_t, rsync_data_t, rsync_data_t)
-@@ -131,4 +137,19 @@
- auth_read_all_symlinks_except_shadow(rsync_t)
- auth_tunable_read_shadow(rsync_t)
- ')
-+
-+tunable_policy(`rsync_client',`
-+ corenet_tcp_connect_rsync_port(rsync_t)
-+ corenet_tcp_connect_ssh_port(rsync_t)
-+ manage_dirs_pattern(rsync_t, rsync_data_t, rsync_data_t)
-+ manage_files_pattern(rsync_t, rsync_data_t, rsync_data_t)
-+ manage_lnk_files_pattern(rsync_t, rsync_data_t, rsync_data_t)
-+')
-+
-+optional_policy(`
-+ tunable_policy(`rsync_client',`
-+ ssh_exec(rsync_t)
-+ ')
-+')
-+
- auth_can_read_shadow_passwords(rsync_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rtkit.if serefpolicy-3.7.15/policy/modules/services/rtkit.if
---- nsaserefpolicy/policy/modules/services/rtkit.if 2009-09-16 09:09:20.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/rtkit.if 2010-03-18 10:44:43.000000000 -0400
-@@ -38,3 +38,23 @@
- allow $1 rtkit_daemon_t:dbus send_msg;
- allow rtkit_daemon_t $1:dbus send_msg;
- ')
-+
-+########################################
-+##
-+## Allow rtkit to control scheduling for your process
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`rtkit_daemon_system_domain',`
-+ gen_require(`
-+ type rtkit_daemon_t;
-+ ')
-+
-+ ps_process_pattern(rtkit_daemon_t, $1)
-+ allow rtkit_daemon_t $1:process { getsched setsched };
-+ rtkit_daemon_dbus_chat($1)
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rtkit.te serefpolicy-3.7.15/policy/modules/services/rtkit.te
---- nsaserefpolicy/policy/modules/services/rtkit.te 2009-09-16 09:09:20.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/rtkit.te 2010-03-18 10:44:43.000000000 -0400
-@@ -17,9 +17,11 @@
-
- allow rtkit_daemon_t self:capability { dac_read_search setuid sys_chroot setgid sys_nice sys_ptrace };
- allow rtkit_daemon_t self:process { setsched getcap setcap setrlimit };
-+allow rtkit_daemon_t self:capability sys_nice;
-
- kernel_read_system_state(rtkit_daemon_t)
-
-+domain_getsched_all_domains(rtkit_daemon_t)
- domain_read_all_domains_state(rtkit_daemon_t)
-
- fs_rw_anon_inodefs_files(rtkit_daemon_t)
-@@ -28,7 +30,7 @@
-
- logging_send_syslog_msg(rtkit_daemon_t)
-
--miscfiles_read_localization(locale_t)
-+miscfiles_read_localization(rtkit_daemon_t)
-
- optional_policy(`
- policykit_dbus_chat(rtkit_daemon_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.fc serefpolicy-3.7.15/policy/modules/services/samba.fc
---- nsaserefpolicy/policy/modules/services/samba.fc 2009-07-29 15:15:33.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/samba.fc 2010-03-18 10:44:43.000000000 -0400
-@@ -51,3 +51,7 @@
- /var/run/winbindd(/.*)? gen_context(system_u:object_r:winbind_var_run_t,s0)
-
- /var/spool/samba(/.*)? gen_context(system_u:object_r:samba_var_t,s0)
-+
-+ifndef(`enable_mls',`
-+/var/lib/samba/scripts(/.*)? gen_context(system_u:object_r:samba_unconfined_script_exec_t,s0)
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-3.7.15/policy/modules/services/samba.if
---- nsaserefpolicy/policy/modules/services/samba.if 2009-07-29 15:15:33.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/samba.if 2010-03-18 10:44:43.000000000 -0400
-@@ -62,6 +62,25 @@
-
- ########################################
- ##
-+## Execute samba net in the samba_unconfined_net domain.
-+##
-+##
-+##
-+## The type of the process performing this action.
-+##
-+##
-+#
-+interface(`samba_domtrans_unconfined_net',`
-+ gen_require(`
-+ type samba_unconfined_net_t, samba_net_exec_t;
-+ ')
-+
-+ corecmd_search_bin($1)
-+ domtrans_pattern($1, samba_net_exec_t, samba_unconfined_net_t)
-+')
-+
-+########################################
-+##
- ## Execute samba net in the samba_net domain, and
- ## allow the specified role the samba_net domain.
- ##
-@@ -86,6 +105,50 @@
- role $2 types samba_net_t;
- ')
-
-+#######################################
-+##
-+## The role for the samba module.
-+##
-+##
-+##
-+## The role to be allowed the samba_net domain.
-+##
-+##
-+#
-+template(`samba_role_notrans',`
-+ gen_require(`
-+ type smbd_t;
-+ ')
-+
-+ role $1 types smbd_t;
-+')
-+
-+########################################
-+##
-+## Execute samba net in the samba_unconfined_net domain, and
-+## allow the specified role the samba_unconfined_net domain.
-+##
-+##
-+##
-+## The type of the process performing this action.
-+##
-+##
-+##
-+##
-+## The role to be allowed the samba_unconfined_net domain.
-+##
-+##
-+##
-+#
-+interface(`samba_run_unconfined_net',`
-+ gen_require(`
-+ type samba_unconfined_net_t;
-+ ')
-+
-+ samba_domtrans_unconfined_net($1)
-+ role $2 types samba_unconfined_net_t;
-+')
-+
- ########################################
- ##
- ## Execute smbmount in the smbmount domain.
-@@ -395,6 +458,7 @@
- files_search_var($1)
- files_search_var_lib($1)
- manage_files_pattern($1, samba_var_t, samba_var_t)
-+ manage_lnk_files_pattern($1, samba_var_t, samba_var_t)
- ')
-
- ########################################
-@@ -530,6 +594,7 @@
- ')
-
- domtrans_pattern($1, winbind_helper_exec_t, winbind_helper_t)
-+ allow $1 winbind_helper_t:process signal;
- ')
-
- ########################################
-@@ -577,6 +642,40 @@
- allow $1 winbind_var_run_t:file read_file_perms;
- ')
-
-+#######################################
-+##
-+## Allow domain to signal samba
-+##
-+##
-+##
-+## Domain to not audit.
-+##
-+##
-+#
-+interface(`samba_signal_nmbd',`
-+ gen_require(`
-+ type nmbd_t;
-+ ')
-+ allow $1 nmbd_t:process signal;
-+')
-+
-+######################################
-+##
-+## Allow domain to signal samba
-+##
-+##
-+##
-+## Domain to not audit.
-+##
-+##
-+#
-+interface(`samba_signal_smbd',`
-+ gen_require(`
-+ type smbd_t;
-+ ')
-+ allow $1 smbd_t:process signal;
-+')
-+
- ########################################
- ##
- ## Connect to winbind.
-@@ -610,6 +709,36 @@
-
- ########################################
- ##
-+## Create a set of derived types for apache
-+## web content.
-+##
-+##
-+##
-+## The prefix to be used for deriving type names.
-+##
-+##
-+#
-+template(`samba_helper_template',`
-+ gen_require(`
-+ type smbd_t;
-+ ')
-+ #This type is for samba helper scripts
-+ type samba_$1_script_t;
-+ domain_type(samba_$1_script_t)
-+ role system_r types samba_$1_script_t;
-+
-+ # This type is used for executable scripts files
-+ type samba_$1_script_exec_t;
-+ corecmd_shell_entry_type(samba_$1_script_t)
-+ domain_entry_file(samba_$1_script_t, samba_$1_script_exec_t)
-+
-+ domtrans_pattern(smbd_t, samba_$1_script_exec_t, samba_$1_script_t)
-+ allow smbd_t samba_$1_script_exec_t:file ioctl;
-+
-+')
-+
-+########################################
-+##
- ## All of the rules required to administrate
- ## an samba environment
- ##
-@@ -630,6 +759,7 @@
- type nmbd_t, nmbd_var_run_t;
- type smbd_t, smbd_tmp_t;
- type smbd_var_run_t;
-+ type smbd_initrc_exec_t, smbd_spool_t;
-
- type samba_log_t, samba_var_t;
- type samba_etc_t, samba_share_t;
-@@ -640,6 +770,7 @@
- type winbind_var_run_t, winbind_tmp_t;
- type winbind_log_t;
-
-+ type samba_unconfined_script_t, samba_unconfined_script_exec_t;
- type samba_initrc_exec_t;
- ')
-
-@@ -649,6 +780,9 @@
- allow $1 nmbd_t:process { ptrace signal_perms };
- ps_process_pattern($1, nmbd_t)
-
-+ allow $1 samba_unconfined_script_t:process { ptrace signal_perms getattr };
-+ read_files_pattern($1, samba_unconfined_script_t, samba_unconfined_script_t)
-+
- samba_run_smbcontrol($1, $2, $3)
- samba_run_winbind_helper($1, $2, $3)
- samba_run_smbmount($1, $2, $3)
-@@ -674,6 +808,9 @@
- admin_pattern($1, samba_var_t)
- files_list_var($1)
-
-+ admin_pattern($1, smbd_spool_t)
-+ files_list_spool($1)
-+
- admin_pattern($1, smbd_var_run_t)
- files_list_pids($1)
-
-@@ -689,4 +826,5 @@
- admin_pattern($1, winbind_tmp_t)
-
- admin_pattern($1, winbind_var_run_t)
-+ admin_pattern($1, samba_unconfined_script_exec_t)
- ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-3.7.15/policy/modules/services/samba.te
---- nsaserefpolicy/policy/modules/services/samba.te 2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/samba.te 2010-03-18 10:44:43.000000000 -0400
-@@ -66,6 +66,13 @@
- ##
- gen_tunable(samba_share_nfs, false)
-
-+##
-+##
-+## Allow samba to export ntfs/fusefs volumes.
-+##
-+##
-+gen_tunable(samba_share_fusefs, false)
-+
- type nmbd_t;
- type nmbd_exec_t;
- init_daemon_domain(nmbd_t, nmbd_exec_t)
-@@ -156,7 +163,7 @@
- #
- # Samba net local policy
- #
--allow samba_net_t self:capability { sys_nice dac_read_search dac_override };
-+allow samba_net_t self:capability { sys_chroot sys_nice dac_read_search dac_override };
- allow samba_net_t self:process { getsched setsched };
- allow samba_net_t self:unix_dgram_socket create_socket_perms;
- allow samba_net_t self:unix_stream_socket create_stream_socket_perms;
-@@ -201,14 +208,16 @@
- files_read_usr_symlinks(samba_net_t)
-
- auth_use_nsswitch(samba_net_t)
--auth_read_cache(samba_net_t)
-+auth_manage_cache(samba_net_t)
-
- logging_send_syslog_msg(samba_net_t)
-
- miscfiles_read_localization(samba_net_t)
-
-+samba_read_var_files(samba_net_t)
-+
- userdom_use_user_terminals(samba_net_t)
--userdom_dontaudit_search_user_home_dirs(samba_net_t)
-+userdom_list_user_home_dirs(samba_net_t)
-
- optional_policy(`
- pcscd_read_pub_files(samba_net_t)
-@@ -275,6 +284,8 @@
-
- allow smbd_t winbind_var_run_t:sock_file rw_sock_file_perms;
-
-+allow smbd_t winbind_t:process { signal signull };
-+
- kernel_getattr_core_if(smbd_t)
- kernel_getattr_message_if(smbd_t)
- kernel_read_network_state(smbd_t)
-@@ -306,6 +317,8 @@
- dev_read_urand(smbd_t)
- dev_getattr_mtrr_dev(smbd_t)
- dev_dontaudit_getattr_usbfs_dirs(smbd_t)
-+dev_getattr_all_blk_files(smbd_t)
-+dev_getattr_all_chr_files(smbd_t)
-
- fs_getattr_all_fs(smbd_t)
- fs_get_xattr_fs_quotas(smbd_t)
-@@ -316,6 +329,7 @@
- auth_use_nsswitch(smbd_t)
- auth_domtrans_chk_passwd(smbd_t)
- auth_domtrans_upd_passwd(smbd_t)
-+auth_manage_cache(smbd_t)
-
- domain_use_interactive_fds(smbd_t)
- domain_dontaudit_list_all_domains_state(smbd_t)
-@@ -325,6 +339,8 @@
- files_read_etc_runtime_files(smbd_t)
- files_read_usr_files(smbd_t)
- files_search_spool(smbd_t)
-+# smbd seems to getattr all mountpoints
-+files_dontaudit_getattr_all_dirs(smbd_t)
- # Allow samba to list mnt_t for potential mounted dirs
- files_list_mnt(smbd_t)
-
-@@ -337,10 +353,13 @@
- miscfiles_read_public_files(smbd_t)
-
- userdom_use_unpriv_users_fds(smbd_t)
--userdom_dontaudit_search_user_home_dirs(smbd_t)
-+userdom_search_user_home_content(smbd_t)
-+userdom_signal_all_users(smbd_t)
-
- usermanage_read_crack_db(smbd_t)
-
-+term_use_ptmx(smbd_t)
-+
- ifdef(`hide_broken_symptoms', `
- files_dontaudit_getattr_default_dirs(smbd_t)
- files_dontaudit_getattr_boot_dirs(smbd_t)
-@@ -352,19 +371,19 @@
- ')
-
- tunable_policy(`samba_domain_controller',`
-+ gen_require(`
-+ class passwd passwd;
-+ ')
-+
- usermanage_domtrans_passwd(smbd_t)
- usermanage_kill_passwd(smbd_t)
- usermanage_domtrans_useradd(smbd_t)
- usermanage_domtrans_groupadd(smbd_t)
-+ allow smbd_t self:passwd passwd;
- ')
-
- tunable_policy(`samba_enable_home_dirs',`
-- userdom_manage_user_home_content_dirs(smbd_t)
-- userdom_manage_user_home_content_files(smbd_t)
-- userdom_manage_user_home_content_symlinks(smbd_t)
-- userdom_manage_user_home_content_sockets(smbd_t)
-- userdom_manage_user_home_content_pipes(smbd_t)
-- userdom_user_home_dir_filetrans_user_home_content(smbd_t, { dir file lnk_file sock_file fifo_file })
-+ userdom_manage_user_home_content(smbd_t)
- ')
-
- # Support Samba sharing of NFS mount points
-@@ -376,6 +395,15 @@
- fs_manage_nfs_named_sockets(smbd_t)
- ')
-
-+# Support Samba sharing of ntfs/fusefs mount points
-+tunable_policy(`samba_share_fusefs',`
-+ fs_manage_fusefs_dirs(smbd_t)
-+ fs_manage_fusefs_files(smbd_t)
-+',`
-+ fs_search_fusefs(smbd_t)
-+')
-+
-+
- optional_policy(`
- cups_read_rw_config(smbd_t)
- cups_stream_connect(smbd_t)
-@@ -391,6 +419,11 @@
- ')
-
- optional_policy(`
-+ qemu_manage_tmp_dirs(smbd_t)
-+ qemu_manage_tmp_files(smbd_t)
-+')
-+
-+optional_policy(`
- rpc_search_nfs_state_data(smbd_t)
- ')
-
-@@ -405,13 +438,15 @@
- tunable_policy(`samba_create_home_dirs',`
- allow smbd_t self:capability chown;
- userdom_create_user_home_dirs(smbd_t)
-- userdom_home_filetrans_user_home_dir(smbd_t)
- ')
-+userdom_home_filetrans_user_home_dir(smbd_t)
-
- tunable_policy(`samba_export_all_ro',`
- fs_read_noxattr_fs_files(smbd_t)
-+ auth_read_all_dirs_except_shadow(smbd_t)
- auth_read_all_files_except_shadow(smbd_t)
- fs_read_noxattr_fs_files(nmbd_t)
-+ auth_read_all_dirs_except_shadow(nmbd_t)
- auth_read_all_files_except_shadow(nmbd_t)
- ')
-
-@@ -420,8 +455,8 @@
- auth_manage_all_files_except_shadow(smbd_t)
- fs_read_noxattr_fs_files(nmbd_t)
- auth_manage_all_files_except_shadow(nmbd_t)
-- userdom_user_home_dir_filetrans_user_home_content(nmbd_t, { file dir })
- ')
-+userdom_user_home_dir_filetrans_user_home_content(nmbd_t, { file dir })
-
- ########################################
- #
-@@ -525,6 +560,7 @@
-
- allow smbcontrol_t winbind_t:process { signal signull };
-
-+files_search_var_lib(smbcontrol_t)
- samba_read_config(smbcontrol_t)
- samba_rw_var_files(smbcontrol_t)
- samba_search_var(smbcontrol_t)
-@@ -536,6 +572,8 @@
-
- miscfiles_read_localization(smbcontrol_t)
-
-+userdom_use_user_terminals(smbcontrol_t)
-+
- ########################################
- #
- # smbmount Local policy
-@@ -618,7 +656,7 @@
- # SWAT Local policy
- #
-
--allow swat_t self:capability { setuid setgid sys_resource };
-+allow swat_t self:capability { dac_override setuid setgid sys_resource };
- allow swat_t self:process { setrlimit signal_perms };
- allow swat_t self:fifo_file rw_fifo_file_perms;
- allow swat_t self:netlink_tcpdiag_socket r_netlink_socket_perms;
-@@ -626,23 +664,23 @@
- allow swat_t self:udp_socket create_socket_perms;
- allow swat_t self:unix_stream_socket connectto;
-
--allow swat_t nmbd_t:process { signal signull };
--
--allow swat_t nmbd_exec_t:file mmap_file_perms;
--can_exec(swat_t, nmbd_exec_t)
--
--allow swat_t nmbd_var_run_t:file { lock read unlink };
--
- samba_domtrans_smbd(swat_t)
- allow swat_t smbd_t:process { signal signull };
-+allow smbd_t swat_t:process signal;
-+
-+samba_domtrans_nmbd(swat_t)
-+allow swat_t nmbd_t:process { signal signull };
-+allow nmbd_t swat_t:process signal;
-
- allow swat_t smbd_var_run_t:file { lock unlink };
-
-+allow swat_t smbd_port_t:tcp_socket name_bind;
-+
-+allow swat_t nmbd_port_t:udp_socket name_bind;
-+
- rw_files_pattern(swat_t, samba_etc_t, samba_etc_t)
- read_lnk_files_pattern(swat_t, samba_etc_t, samba_etc_t)
-
--append_files_pattern(swat_t, samba_log_t, samba_log_t)
--
- allow swat_t smbd_exec_t:file mmap_file_perms ;
-
- allow swat_t smbd_t:process signull;
-@@ -657,7 +695,8 @@
- files_pid_filetrans(swat_t, swat_var_run_t, file)
-
- allow swat_t winbind_exec_t:file mmap_file_perms;
--can_exec(swat_t, winbind_exec_t)
-+domtrans_pattern(swat_t, winbind_exec_t, winbind_t)
-+allow swat_t winbind_t:process { signal signull };
-
- allow swat_t winbind_var_run_t:dir { write add_name remove_name };
- allow swat_t winbind_var_run_t:sock_file { create unlink };
-@@ -700,6 +739,8 @@
-
- miscfiles_read_localization(swat_t)
-
-+userdom_dontaudit_search_admin_dir(swat_t)
-+
- optional_policy(`
- cups_read_rw_config(swat_t)
- cups_stream_connect(swat_t)
-@@ -713,12 +754,23 @@
- kerberos_use(swat_t)
- ')
-
-+init_read_utmp(swat_t)
-+init_dontaudit_write_utmp(swat_t)
-+
-+manage_dirs_pattern(swat_t, samba_log_t, samba_log_t)
-+manage_files_pattern(swat_t, samba_log_t, samba_log_t)
-+
-+manage_files_pattern(swat_t, samba_etc_t, samba_secrets_t)
-+
-+manage_files_pattern(swat_t, samba_var_t, samba_var_t)
-+files_list_var_lib(swat_t)
-+
- ########################################
- #
- # Winbind local policy
- #
-
--allow winbind_t self:capability { dac_override ipc_lock setuid };
-+allow winbind_t self:capability { sys_nice dac_override ipc_lock setuid };
- dontaudit winbind_t self:capability sys_tty_config;
- allow winbind_t self:process { signal_perms getsched setsched };
- allow winbind_t self:fifo_file rw_fifo_file_perms;
-@@ -779,6 +831,9 @@
- corenet_tcp_bind_generic_node(winbind_t)
- corenet_udp_bind_generic_node(winbind_t)
- corenet_tcp_connect_smbd_port(winbind_t)
-+corenet_tcp_connect_smbd_port(winbind_t)
-+corenet_tcp_connect_epmap_port(winbind_t)
-+corenet_tcp_connect_all_unreserved_ports(winbind_t)
-
- dev_read_sysfs(winbind_t)
- dev_read_urand(winbind_t)
-@@ -788,7 +843,7 @@
-
- auth_domtrans_chk_passwd(winbind_t)
- auth_use_nsswitch(winbind_t)
--auth_rw_cache(winbind_t)
-+auth_manage_cache(winbind_t)
-
- domain_use_interactive_fds(winbind_t)
-
-@@ -866,6 +921,18 @@
- #
-
- optional_policy(`
-+ type samba_unconfined_net_t;
-+ domain_type(samba_unconfined_net_t)
-+ domain_entry_file(samba_unconfined_net_t, samba_net_exec_t)
-+ role system_r types samba_unconfined_net_t;
-+
-+ unconfined_domain(samba_unconfined_net_t)
-+
-+ manage_files_pattern(samba_unconfined_net_t, samba_etc_t, samba_secrets_t)
-+ filetrans_pattern(samba_unconfined_net_t, samba_etc_t, samba_secrets_t, file)
-+ userdom_use_user_terminals(samba_unconfined_net_t)
-+')
-+
- type samba_unconfined_script_t;
- type samba_unconfined_script_exec_t;
- domain_type(samba_unconfined_script_t)
-@@ -876,9 +943,12 @@
- allow smbd_t samba_unconfined_script_exec_t:dir search_dir_perms;
- allow smbd_t samba_unconfined_script_exec_t:file ioctl;
-
-+optional_policy(`
- unconfined_domain(samba_unconfined_script_t)
-+')
-
- tunable_policy(`samba_run_unconfined',`
- domtrans_pattern(smbd_t, samba_unconfined_script_exec_t, samba_unconfined_script_t)
-- ')
-+',`
-+ can_exec(smbd_t, samba_unconfined_script_exec_t)
- ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl.te serefpolicy-3.7.15/policy/modules/services/sasl.te
---- nsaserefpolicy/policy/modules/services/sasl.te 2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/sasl.te 2010-03-18 10:44:43.000000000 -0400
-@@ -31,7 +31,7 @@
- # Local policy
- #
-
--allow saslauthd_t self:capability setuid;
-+allow saslauthd_t self:capability { setgid setuid };
- dontaudit saslauthd_t self:capability sys_tty_config;
- allow saslauthd_t self:process signal_perms;
- allow saslauthd_t self:fifo_file rw_fifo_file_perms;
-@@ -58,7 +58,6 @@
- corenet_tcp_connect_pop_port(saslauthd_t)
- corenet_sendrecv_pop_client_packets(saslauthd_t)
-
--dev_read_sysfs(saslauthd_t)
- dev_read_urand(saslauthd_t)
-
- fs_getattr_all_fs(saslauthd_t)
-@@ -66,8 +65,7 @@
-
- selinux_compute_access_vector(saslauthd_t)
-
--auth_domtrans_chk_passwd(saslauthd_t)
--auth_use_nsswitch(saslauthd_t)
-+auth_use_pam(saslauthd_t)
-
- domain_use_interactive_fds(saslauthd_t)
-
-@@ -79,15 +77,11 @@
-
- init_dontaudit_stream_connect_script(saslauthd_t)
-
--logging_send_syslog_msg(saslauthd_t)
--
- miscfiles_read_localization(saslauthd_t)
- miscfiles_read_certs(saslauthd_t)
-
- seutil_dontaudit_read_config(saslauthd_t)
-
--sysnet_read_config(saslauthd_t)
--
- userdom_dontaudit_use_unpriv_user_fds(saslauthd_t)
- userdom_dontaudit_search_user_home_dirs(saslauthd_t)
-
-@@ -99,7 +93,6 @@
-
- optional_policy(`
- kerberos_keytab_template(saslauthd, saslauthd_t)
-- kerberos_manage_host_rcache(saslauthd_t)
- ')
-
- optional_policy(`
-@@ -108,10 +101,6 @@
- ')
-
- optional_policy(`
-- nis_authenticate(saslauthd_t)
--')
--
--optional_policy(`
- seutil_sigchld_newrole(saslauthd_t)
- ')
-
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.if serefpolicy-3.7.15/policy/modules/services/sendmail.if
---- nsaserefpolicy/policy/modules/services/sendmail.if 2010-01-11 09:40:36.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/sendmail.if 2010-03-18 10:44:43.000000000 -0400
-@@ -277,3 +277,22 @@
- sendmail_domtrans_unconfined($1)
- role $2 types unconfined_sendmail_t;
- ')
-+
-+########################################
-+##
-+## Execute sendmail in the unconfined sendmail domain.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`sendmail_domtrans_unconfined',`
-+ gen_require(`
-+ type unconfined_sendmail_t, sendmail_exec_t;
-+ ')
-+
-+ domtrans_pattern($1, sendmail_exec_t, unconfined_sendmail_t)
-+')
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-3.7.15/policy/modules/services/sendmail.te
---- nsaserefpolicy/policy/modules/services/sendmail.te 2010-01-11 09:40:36.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/sendmail.te 2010-03-18 10:44:43.000000000 -0400
-@@ -30,7 +30,7 @@
- #
-
- allow sendmail_t self:capability { dac_override setuid setgid net_bind_service sys_nice chown sys_tty_config };
--allow sendmail_t self:process { setrlimit signal signull };
-+allow sendmail_t self:process { setsched setpgid setrlimit signal signull };
- allow sendmail_t self:fifo_file rw_fifo_file_perms;
- allow sendmail_t self:unix_stream_socket create_stream_socket_perms;
- allow sendmail_t self:unix_dgram_socket create_socket_perms;
-@@ -72,6 +72,7 @@
- fs_rw_anon_inodefs_files(sendmail_t)
-
- term_dontaudit_use_console(sendmail_t)
-+term_dontaudit_use_generic_ptys(sendmail_t)
-
- # for piping mail to a command
- corecmd_exec_shell(sendmail_t)
-@@ -84,12 +85,14 @@
- files_search_spool(sendmail_t)
- # for piping mail to a command
- files_read_etc_runtime_files(sendmail_t)
-+files_read_all_tmp_files(sendmail_t)
-
- init_use_fds(sendmail_t)
- init_use_script_ptys(sendmail_t)
- # sendmail wants to read /var/run/utmp if the controlling tty is /dev/console
- init_read_utmp(sendmail_t)
- init_dontaudit_write_utmp(sendmail_t)
-+init_rw_script_tmp_files(sendmail_t)
-
- auth_use_nsswitch(sendmail_t)
-
-@@ -103,7 +106,7 @@
- miscfiles_read_localization(sendmail_t)
-
- userdom_dontaudit_use_unpriv_user_fds(sendmail_t)
--userdom_dontaudit_search_user_home_dirs(sendmail_t)
-+userdom_read_user_home_content_files(sendmail_t)
-
- mta_read_config(sendmail_t)
- mta_etc_filetrans_aliases(sendmail_t)
-@@ -133,6 +136,7 @@
-
- optional_policy(`
- fail2ban_read_lib_files(sendmail_t)
-+ fail2ban_rw_stream_sockets(sendmail_t)
- ')
-
- optional_policy(`
-@@ -148,7 +152,9 @@
- ')
-
- optional_policy(`
-+ postfix_domtrans_postdrop(sendmail_t)
- postfix_domtrans_master(sendmail_t)
-+ postfix_domtrans_postqueue(sendmail_t)
- postfix_read_config(sendmail_t)
- postfix_search_spool(sendmail_t)
- ')
-@@ -167,6 +173,10 @@
- ')
-
- optional_policy(`
-+ spamd_stream_connect(sendmail_t)
-+')
-+
-+optional_policy(`
- udev_read_db(sendmail_t)
- ')
-
-@@ -182,5 +192,6 @@
-
- optional_policy(`
- mta_etc_filetrans_aliases(unconfined_sendmail_t)
-- unconfined_domain(unconfined_sendmail_t)
-+ unconfined_domain_noaudit(unconfined_sendmail_t)
- ')
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.fc serefpolicy-3.7.15/policy/modules/services/setroubleshoot.fc
---- nsaserefpolicy/policy/modules/services/setroubleshoot.fc 2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/setroubleshoot.fc 2010-03-18 10:44:43.000000000 -0400
-@@ -5,3 +5,5 @@
- /var/log/setroubleshoot(/.*)? gen_context(system_u:object_r:setroubleshoot_var_log_t,s0)
-
- /var/lib/setroubleshoot(/.*)? gen_context(system_u:object_r:setroubleshoot_var_lib_t,s0)
-+
-+/usr/share/setroubleshoot/SetroubleshootFixit\.py* -- gen_context(system_u:object_r:setroubleshoot_fixit_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-3.7.15/policy/modules/services/setroubleshoot.if
---- nsaserefpolicy/policy/modules/services/setroubleshoot.if 2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/setroubleshoot.if 2010-03-18 10:44:43.000000000 -0400
-@@ -16,8 +16,8 @@
- ')
-
- files_search_pids($1)
-- allow $1 setroubleshoot_var_run_t:sock_file write;
-- allow $1 setroubleshootd_t:unix_stream_socket connectto;
-+ stream_connect_pattern($1, setroubleshoot_var_run_t, setroubleshoot_var_run_t, setroubleshootd_t)
-+ allow $1 setroubleshoot_var_run_t:sock_file read;
- ')
-
- ########################################
-@@ -36,6 +36,124 @@
- type setroubleshootd_t, setroubleshoot_var_run_t;
- ')
-
-- dontaudit $1 setroubleshoot_var_run_t:sock_file write;
-+ dontaudit $1 setroubleshoot_var_run_t:sock_file rw_sock_file_perms;
- dontaudit $1 setroubleshootd_t:unix_stream_socket connectto;
- ')
-+
-+########################################
-+##
-+## Send and receive messages from
-+## setroubleshoot over dbus.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`setroubleshoot_dbus_chat',`
-+ gen_require(`
-+ type setroubleshootd_t;
-+ class dbus send_msg;
-+ ')
-+
-+ allow $1 setroubleshootd_t:dbus send_msg;
-+ allow setroubleshootd_t $1:dbus send_msg;
-+')
-+
-+########################################
-+##
-+## dontaudit send and receive messages from
-+## setroubleshoot over dbus.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`setroubleshoot_dontaudit_dbus_chat',`
-+ gen_require(`
-+ type setroubleshootd_t;
-+ class dbus send_msg;
-+ ')
-+
-+ dontaudit $1 setroubleshootd_t:dbus send_msg;
-+ dontaudit setroubleshootd_t $1:dbus send_msg;
-+')
-+
-+########################################
-+##
-+## Send and receive messages from
-+## setroubleshoot over dbus.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`setroubleshoot_dbus_chat_fixit',`
-+ gen_require(`
-+ type setroubleshoot_fixit_t;
-+ class dbus send_msg;
-+ ')
-+
-+ allow $1 setroubleshoot_fixit_t:dbus send_msg;
-+ allow setroubleshoot_fixit_t $1:dbus send_msg;
-+')
-+
-+########################################
-+##
-+## Dontaudit read/write to a setroubleshoot leaked sockets.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`setroubleshoot_fixit_dontaudit_leaks',`
-+ gen_require(`
-+ type setroubleshoot_fixit_t;
-+ ')
-+
-+ dontaudit $1 setroubleshoot_fixit_t:unix_dgram_socket { read write };
-+ dontaudit $1 setroubleshoot_fixit_t:unix_stream_socket { read write };
-+')
-+
-+########################################
-+##
-+## All of the rules required to administrate
-+## an setroubleshoot environment
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+##
-+##
-+## The role to be allowed to manage the setroubleshoot domain.
-+##
-+##
-+##
-+#
-+interface(`setroubleshoot_admin',`
-+ gen_require(`
-+ type setroubleshootd_t, setroubleshoot_log_t;
-+ type setroubleshoot_var_lib_t, setroubleshoot_var_run_t;
-+ ')
-+
-+ allow $1 setroubleshootd_t:process { ptrace signal_perms };
-+ ps_process_pattern($1, setroubleshootd_t)
-+
-+ logging_list_logs($1)
-+ admin_pattern($1, setroubleshoot_log_t)
-+
-+ files_list_var_lib($1)
-+ admin_pattern($1, setroubleshoot_var_lib_t)
-+
-+ files_list_pids($1)
-+ admin_pattern($1, setroubleshoot_var_run_t)
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-3.7.15/policy/modules/services/setroubleshoot.te
---- nsaserefpolicy/policy/modules/services/setroubleshoot.te 2010-02-12 10:33:09.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/setroubleshoot.te 2010-03-18 10:44:43.000000000 -0400
-@@ -22,13 +22,19 @@
- type setroubleshoot_var_run_t;
- files_pid_file(setroubleshoot_var_run_t)
-
-+type setroubleshoot_fixit_t;
-+type setroubleshoot_fixit_exec_t;
-+dbus_system_domain(setroubleshoot_fixit_t, setroubleshoot_fixit_exec_t)
-+
- ########################################
- #
- # setroubleshootd local policy
- #
-
--allow setroubleshootd_t self:capability { dac_override sys_tty_config };
--allow setroubleshootd_t self:process { signull signal getattr getsched };
-+allow setroubleshootd_t self:capability { dac_override sys_nice sys_tty_config };
-+allow setroubleshootd_t self:process { getattr getsched setsched sigkill signull signal };
-+# if bad library causes setroubleshoot to require these, we want to give it so setroubleshoot can continue to run
-+allow setroubleshootd_t self:process { execmem execstack };
- allow setroubleshootd_t self:fifo_file rw_fifo_file_perms;
- allow setroubleshootd_t self:tcp_socket create_stream_socket_perms;
- allow setroubleshootd_t self:unix_stream_socket { create_stream_socket_perms connectto };
-@@ -52,7 +58,10 @@
-
- kernel_read_kernel_sysctls(setroubleshootd_t)
- kernel_read_system_state(setroubleshootd_t)
-+kernel_read_net_sysctls(setroubleshootd_t)
- kernel_read_network_state(setroubleshootd_t)
-+kernel_dontaudit_list_all_proc(setroubleshootd_t)
-+kernel_read_unlabeled_state(setroubleshootd_t)
-
- corecmd_exec_bin(setroubleshootd_t)
- corecmd_exec_shell(setroubleshootd_t)
-@@ -68,16 +77,26 @@
-
- dev_read_urand(setroubleshootd_t)
- dev_read_sysfs(setroubleshootd_t)
-+dev_getattr_all_blk_files(setroubleshootd_t)
-+dev_getattr_all_chr_files(setroubleshootd_t)
-
- domain_dontaudit_search_all_domains_state(setroubleshootd_t)
-+domain_signull_all_domains(setroubleshootd_t)
-
- files_read_usr_files(setroubleshootd_t)
- files_read_etc_files(setroubleshootd_t)
--files_getattr_all_dirs(setroubleshootd_t)
-+files_list_all(setroubleshootd_t)
- files_getattr_all_files(setroubleshootd_t)
-+files_getattr_all_pipes(setroubleshootd_t)
-+files_getattr_all_sockets(setroubleshootd_t)
-+files_read_all_symlinks(setroubleshootd_t)
-
- fs_getattr_all_dirs(setroubleshootd_t)
- fs_getattr_all_files(setroubleshootd_t)
-+fs_read_fusefs_symlinks(setroubleshootd_t)
-+fs_dontaudit_read_nfs_files(setroubleshootd_t)
-+fs_dontaudit_read_cifs_files(setroubleshootd_t)
-+fs_list_inotifyfs(setroubleshootd_t)
-
- selinux_get_enforce_mode(setroubleshootd_t)
- selinux_validate_context(setroubleshootd_t)
-@@ -94,23 +113,81 @@
-
- locallogin_dontaudit_use_fds(setroubleshootd_t)
-
-+logging_send_audit_msgs(setroubleshootd_t)
- logging_send_syslog_msg(setroubleshootd_t)
- logging_stream_connect_dispatcher(setroubleshootd_t)
-
-+modutils_read_module_config(setroubleshootd_t)
-+
- seutil_read_config(setroubleshootd_t)
- seutil_read_file_contexts(setroubleshootd_t)
--
--sysnet_read_config(setroubleshootd_t)
-+seutil_read_bin_policy(setroubleshootd_t)
-
- userdom_dontaudit_read_user_home_content_files(setroubleshootd_t)
-
- optional_policy(`
-- dbus_system_bus_client(setroubleshootd_t)
-- dbus_connect_system_bus(setroubleshootd_t)
-+ locate_read_lib_files(setroubleshootd_t)
-+')
-+
-+optional_policy(`
-+ dbus_system_domain(setroubleshootd_t, setroubleshootd_exec_t)
- ')
-
- optional_policy(`
-+ rpm_signull(setroubleshootd_t)
- rpm_read_db(setroubleshootd_t)
- rpm_dontaudit_manage_db(setroubleshootd_t)
- rpm_use_script_fds(setroubleshootd_t)
- ')
-+
-+########################################
-+#
-+# setroubleshoot_fixit local policy
-+#
-+allow setroubleshoot_fixit_t self:capability sys_nice;
-+allow setroubleshoot_fixit_t self:process { setsched getsched };
-+allow setroubleshoot_fixit_t self:fifo_file rw_fifo_file_perms;
-+allow setroubleshoot_fixit_t self:unix_dgram_socket create_socket_perms;
-+
-+allow setroubleshoot_fixit_t setroubleshootd_t:process signull;
-+
-+setroubleshoot_dbus_chat(setroubleshoot_fixit_t)
-+setroubleshoot_stream_connect(setroubleshoot_fixit_t)
-+
-+corecmd_exec_bin(setroubleshoot_fixit_t)
-+corecmd_exec_shell(setroubleshoot_fixit_t)
-+
-+seutil_domtrans_setfiles(setroubleshoot_fixit_t)
-+seutil_domtrans_setsebool(setroubleshoot_fixit_t)
-+
-+files_read_usr_files(setroubleshoot_fixit_t)
-+files_read_etc_files(setroubleshoot_fixit_t)
-+files_list_tmp(setroubleshoot_fixit_t)
-+
-+kernel_read_system_state(setroubleshoot_fixit_t)
-+
-+auth_use_nsswitch(setroubleshoot_fixit_t)
-+
-+logging_send_audit_msgs(setroubleshoot_fixit_t)
-+logging_send_syslog_msg(setroubleshoot_fixit_t)
-+
-+miscfiles_read_localization(setroubleshoot_fixit_t)
-+
-+userdom_dontaudit_search_admin_dir(setroubleshoot_fixit_t)
-+userdom_signull_unpriv_users(setroubleshoot_fixit_t)
-+
-+optional_policy(`
-+ gnome_dontaudit_search_config(setroubleshoot_fixit_t)
-+')
-+
-+optional_policy(`
-+ rpm_signull(setroubleshoot_fixit_t)
-+ rpm_read_db(setroubleshoot_fixit_t)
-+ rpm_dontaudit_manage_db(setroubleshoot_fixit_t)
-+ rpm_use_script_fds(setroubleshoot_fixit_t)
-+')
-+
-+optional_policy(`
-+ policykit_dbus_chat(setroubleshoot_fixit_t)
-+ userdom_read_all_users_state(setroubleshoot_fixit_t)
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smokeping.fc serefpolicy-3.7.15/policy/modules/services/smokeping.fc
---- nsaserefpolicy/policy/modules/services/smokeping.fc 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/smokeping.fc 2010-03-18 10:44:43.000000000 -0400
-@@ -0,0 +1,12 @@
-+
-+/etc/rc\.d/init\.d/smokeping -- gen_context(system_u:object_r:smokeping_initrc_exec_t,s0)
-+
-+/usr/sbin/smokeping -- gen_context(system_u:object_r:smokeping_exec_t,s0)
-+
-+/usr/share/smokeping/cgi(/.*)? gen_context(system_u:object_r:httpd_smokeping_cgi_script_exec_t,s0)
-+
-+/var/lib/smokeping(/.*)? gen_context(system_u:object_r:smokeping_var_lib_t,s0)
-+
-+/var/run/smokeping(/.*)? gen_context(system_u:object_r:smokeping_var_run_t,s0)
-+
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smokeping.if serefpolicy-3.7.15/policy/modules/services/smokeping.if
---- nsaserefpolicy/policy/modules/services/smokeping.if 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/smokeping.if 2010-03-18 10:44:43.000000000 -0400
-@@ -0,0 +1,193 @@
-+
-+## policy for smokeping
-+
-+########################################
-+##
-+## Execute a domain transition to run smokeping.
-+##
-+##
-+##
-+## Domain allowed to transition.
-+##
-+##
-+#
-+interface(`smokeping_domtrans',`
-+ gen_require(`
-+ type smokeping_t, smokeping_exec_t;
-+ ')
-+
-+ domtrans_pattern($1, smokeping_exec_t, smokeping_t)
-+')
-+
-+
-+########################################
-+##
-+## Execute smokeping server in the smokeping domain.
-+##
-+##
-+##
-+## The type of the process performing this action.
-+##
-+##
-+#
-+interface(`smokeping_initrc_domtrans',`
-+ gen_require(`
-+ type smokeping_initrc_exec_t;
-+ ')
-+
-+ init_labeled_script_domtrans($1, smokeping_initrc_exec_t)
-+')
-+
-+########################################
-+##
-+## Read smokeping PID files.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`smokeping_read_pid_files',`
-+ gen_require(`
-+ type smokeping_var_run_t;
-+ ')
-+
-+ files_search_pids($1)
-+ allow $1 smokeping_var_run_t:file read_file_perms;
-+')
-+
-+########################################
-+##
-+## Manage smokeping var_run files.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`smokeping_manage_var_run',`
-+ gen_require(`
-+ type smokeping_var_run_t;
-+ ')
-+
-+ manage_dirs_pattern($1, smokeping_var_run_t, smokeping_var_run_t)
-+ manage_files_pattern($1, smokeping_var_run_t, smokeping_var_run_t)
-+ manage_lnk_files_pattern($1, smokeping_var_run_t, smokeping_var_run_t)
-+')
-+
-+
-+########################################
-+##
-+## Search smokeping lib directories.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`smokeping_getattr_lib_files',`
-+ gen_require(`
-+ type smokeping_var_lib_t;
-+ ')
-+
-+ getattr_files_pattern($1, smokeping_var_lib_t, smokeping_var_lib_t)
-+ files_search_var_lib($1)
-+')
-+
-+########################################
-+##
-+## Read smokeping lib files.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`smokeping_read_lib_files',`
-+ gen_require(`
-+ type smokeping_var_lib_t;
-+ ')
-+
-+ files_search_var_lib($1)
-+ read_files_pattern($1, smokeping_var_lib_t, smokeping_var_lib_t)
-+')
-+
-+########################################
-+##
-+## Create, read, write, and delete
-+## smokeping lib files.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`smokeping_manage_lib_files',`
-+ gen_require(`
-+ type smokeping_var_lib_t;
-+ ')
-+
-+ files_search_var_lib($1)
-+ manage_files_pattern($1, smokeping_var_lib_t, smokeping_var_lib_t)
-+')
-+
-+########################################
-+##
-+## Manage smokeping var_lib files.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`smokeping_manage_var_lib',`
-+ gen_require(`
-+ type smokeping_var_lib_t;
-+ ')
-+
-+ manage_dirs_pattern($1, smokeping_var_lib_t, smokeping_var_lib_t)
-+ manage_files_pattern($1, smokeping_var_lib_t, smokeping_var_lib_t)
-+ manage_lnk_files_pattern($1, smokeping_var_lib_t, smokeping_var_lib_t)
-+')
-+
-+########################################
-+##
-+## All of the rules required to administrate
-+## an smokeping environment
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+##
-+##
-+## Role allowed access.
-+##
-+##
-+##
-+#
-+interface(`smokeping_admin',`
-+ gen_require(`
-+ type smokeping_t, smokeping_initrc_exec_t;
-+ ')
-+
-+ allow $1 smokeping_t:process { ptrace signal_perms getattr };
-+ read_files_pattern($1, smokeping_t, smokeping_t)
-+
-+ smokeping_initrc_domtrans($1)
-+ domain_system_change_exemption($1)
-+ role_transition $2 smokeping_initrc_exec_t system_r;
-+ allow $2 system_r;
-+
-+ smokeping_manage_var_run($1)
-+
-+ smokeping_manage_var_lib($1)
-+
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smokeping.te serefpolicy-3.7.15/policy/modules/services/smokeping.te
---- nsaserefpolicy/policy/modules/services/smokeping.te 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/smokeping.te 2010-03-18 10:44:43.000000000 -0400
-@@ -0,0 +1,81 @@
-+
-+policy_module(smokeping,1.0.0)
-+
-+########################################
-+#
-+# Declarations
-+#
-+
-+type smokeping_t;
-+type smokeping_exec_t;
-+init_daemon_domain(smokeping_t, smokeping_exec_t)
-+
-+permissive smokeping_t;
-+
-+type smokeping_initrc_exec_t;
-+init_script_file(smokeping_initrc_exec_t)
-+
-+type smokeping_var_run_t;
-+files_pid_file(smokeping_var_run_t)
-+
-+type smokeping_var_lib_t;
-+files_type(smokeping_var_lib_t)
-+
-+########################################
-+#
-+# smokeping local policy
-+#
-+
-+# to read /etc/shadow
-+allow smokeping_t self:capability dac_override;
-+
-+allow smokeping_t self:fifo_file rw_fifo_file_perms;
-+allow smokeping_t self:udp_socket create_socket_perms;
-+allow smokeping_t self:unix_stream_socket create_stream_socket_perms;
-+
-+manage_dirs_pattern(smokeping_t, smokeping_var_run_t, smokeping_var_run_t)
-+manage_files_pattern(smokeping_t, smokeping_var_run_t, smokeping_var_run_t)
-+files_pid_filetrans(smokeping_t, smokeping_var_run_t, { file dir })
-+
-+manage_dirs_pattern(smokeping_t, smokeping_var_lib_t, smokeping_var_lib_t)
-+manage_files_pattern(smokeping_t, smokeping_var_lib_t, smokeping_var_lib_t)
-+files_var_lib_filetrans(smokeping_t, smokeping_var_lib_t, { file dir } )
-+
-+corecmd_read_bin_symlinks(smokeping_t)
-+
-+dev_read_urand(smokeping_t)
-+
-+files_read_etc_files(smokeping_t)
-+files_read_usr_files(smokeping_t)
-+files_search_tmp(smokeping_t)
-+
-+auth_use_nsswitch(smokeping_t)
-+auth_read_shadow(smokeping_t)
-+
-+logging_send_syslog_msg(smokeping_t)
-+
-+miscfiles_read_localization(smokeping_t)
-+
-+mta_send_mail(smokeping_t)
-+
-+netutils_domtrans_ping(smokeping_t)
-+
-+#######################################
-+#
-+# local policy for smokeping cgi scripts
-+#
-+
-+optional_policy(`
-+ apache_content_template(smokeping_cgi)
-+
-+ allow httpd_smokeping_cgi_script_t self:udp_socket create_socket_perms;
-+
-+ manage_files_pattern(httpd_smokeping_cgi_script_t, smokeping_var_lib_t, smokeping_var_lib_t)
-+
-+ getattr_files_pattern(httpd_smokeping_cgi_script_t, smokeping_var_run_t, smokeping_var_run_t)
-+
-+ files_search_tmp(httpd_smokeping_cgi_script_t)
-+ files_search_var_lib(httpd_smokeping_cgi_script_t)
-+
-+ sysnet_dns_name_resolve(httpd_smokeping_cgi_script_t)
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.te serefpolicy-3.7.15/policy/modules/services/snmp.te
---- nsaserefpolicy/policy/modules/services/snmp.te 2010-01-07 14:53:53.000000000 -0500
-+++ serefpolicy-3.7.15/policy/modules/services/snmp.te 2010-03-18 10:44:43.000000000 -0400
-@@ -25,7 +25,7 @@
- #
- # Local policy
- #
--allow snmpd_t self:capability { dac_override kill ipc_lock sys_ptrace net_admin sys_nice sys_tty_config };
-+allow snmpd_t self:capability { chown dac_override kill ipc_lock sys_ptrace net_admin sys_nice sys_tty_config };
- dontaudit snmpd_t self:capability { sys_module sys_tty_config };
- allow snmpd_t self:process { signal_perms getsched setsched };
- allow snmpd_t self:fifo_file rw_fifo_file_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snort.te serefpolicy-3.7.15/policy/modules/services/snort.te
---- nsaserefpolicy/policy/modules/services/snort.te 2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/snort.te 2010-03-18 10:44:43.000000000 -0400
-@@ -37,6 +37,7 @@
- allow snort_t self:tcp_socket create_stream_socket_perms;
- allow snort_t self:udp_socket create_socket_perms;
- allow snort_t self:packet_socket create_socket_perms;
-+allow snort_t self:socket create_socket_perms;
- # Snort IPS node. unverified.
- allow snort_t self:netlink_firewall_socket { bind create getattr };
-
-@@ -55,11 +56,12 @@
- manage_files_pattern(snort_t, snort_var_run_t, snort_var_run_t)
- files_pid_filetrans(snort_t, snort_var_run_t, file)
-
--kernel_read_kernel_sysctls(snort_t)
--kernel_read_sysctl(snort_t)
-+kernel_dontaudit_read_system_state(snort_t)
- kernel_list_proc(snort_t)
-+kernel_read_kernel_sysctls(snort_t)
- kernel_read_proc_symlinks(snort_t)
--kernel_dontaudit_read_system_state(snort_t)
-+kernel_read_sysctl(snort_t)
-+kernel_request_load_module(snort_t)
-
- corenet_all_recvfrom_unlabeled(snort_t)
- corenet_all_recvfrom_netlabel(snort_t)
-@@ -76,6 +78,8 @@
- dev_read_sysfs(snort_t)
- dev_read_rand(snort_t)
- dev_read_urand(snort_t)
-+dev_read_usbmon_dev(snort_t)
-+dev_rw_generic_usb_dev(snort_t)
-
- domain_use_interactive_fds(snort_t)
-
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.fc serefpolicy-3.7.15/policy/modules/services/spamassassin.fc
---- nsaserefpolicy/policy/modules/services/spamassassin.fc 2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/spamassassin.fc 2010-03-18 10:44:43.000000000 -0400
-@@ -1,15 +1,26 @@
--HOME_DIR/\.spamassassin(/.*)? gen_context(system_u:object_r:spamassassin_home_t,s0)
-+HOME_DIR/\.spamassassin(/.*)? gen_context(system_u:object_r:spamc_home_t,s0)
-+/root/\.spamassassin(/.*)? gen_context(system_u:object_r:spamc_home_t,s0)
-+
-+/etc/rc\.d/init\.d/spamd -- gen_context(system_u:object_r:spamd_initrc_exec_t,s0)
-+/etc/rc\.d/init\.d/mimedefang.* -- gen_context(system_u:object_r:spamd_initrc_exec_t,s0)
-
- /usr/bin/sa-learn -- gen_context(system_u:object_r:spamc_exec_t,s0)
--/usr/bin/spamassassin -- gen_context(system_u:object_r:spamassassin_exec_t,s0)
-+/usr/bin/spamassassin -- gen_context(system_u:object_r:spamc_exec_t,s0)
- /usr/bin/spamc -- gen_context(system_u:object_r:spamc_exec_t,s0)
- /usr/bin/spamd -- gen_context(system_u:object_r:spamd_exec_t,s0)
-
- /usr/sbin/spamd -- gen_context(system_u:object_r:spamd_exec_t,s0)
-+/usr/bin/mimedefang-multiplexor -- gen_context(system_u:object_r:spamd_exec_t,s0)
-
- /var/lib/spamassassin(/.*)? gen_context(system_u:object_r:spamd_var_lib_t,s0)
-+/var/lib/spamassassin/compiled(/.*)? gen_context(system_u:object_r:spamd_compiled_t,s0)
-+
-+/var/log/spamd\.log -- gen_context(system_u:object_r:spamd_log_t,s0)
-+/var/log/mimedefang -- gen_context(system_u:object_r:spamd_log_t,s0)
-
- /var/run/spamassassin(/.*)? gen_context(system_u:object_r:spamd_var_run_t,s0)
-
- /var/spool/spamassassin(/.*)? gen_context(system_u:object_r:spamd_spool_t,s0)
- /var/spool/spamd(/.*)? gen_context(system_u:object_r:spamd_spool_t,s0)
-+/var/spool/MD-Quarantine(/.*)? gen_context(system_u:object_r:spamd_var_run_t,s0)
-+/var/spool/MIMEDefang(/.*)? gen_context(system_u:object_r:spamd_var_run_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.if serefpolicy-3.7.15/policy/modules/services/spamassassin.if
---- nsaserefpolicy/policy/modules/services/spamassassin.if 2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/spamassassin.if 2010-03-18 10:44:43.000000000 -0400
-@@ -111,6 +111,45 @@
- ')
-
- domtrans_pattern($1, spamc_exec_t, spamc_t)
-+ allow $1 spamc_exec_t:file ioctl;
-+')
-+
-+########################################
-+##
-+## Send kill signal to spamassassin client
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`spamassassin_kill_client',`
-+ gen_require(`
-+ type spamc_t;
-+ ')
-+
-+ allow $1 spamc_t:process sigkill;
-+')
-+
-+########################################
-+##
-+## Manage spamc home files.
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+#
-+interface(`spamassassin_manage_home_client',`
-+ gen_require(`
-+ type spamc_home_t;
-+ ')
-+
-+ manage_dirs_pattern($1, spamc_home_t, spamc_home_t)
-+ manage_files_pattern($1, spamc_home_t, spamc_home_t)
-+ manage_lnk_files_pattern($1, spamc_home_t, spamc_home_t)
- ')
-
- ########################################
-@@ -166,7 +205,9 @@
- ')
-
- files_search_var_lib($1)
-+ list_dirs_pattern($1, spamd_var_lib_t, spamd_var_lib_t)
- read_files_pattern($1, spamd_var_lib_t, spamd_var_lib_t)
-+ read_lnk_files_pattern($1, spamd_var_lib_t, spamd_var_lib_t)
- ')
-
- ########################################
-@@ -225,3 +266,69 @@
-
- dontaudit $1 spamd_tmp_t:sock_file getattr;
- ')
-+
-+########################################
-+##
-+## Connect to run spamd.
-+##
-+##
-+##
-+## Domain allowed to connect.
-+##
-+##
-+#
-+interface(`spamd_stream_connect',`
-+ gen_require(`
-+ type spamd_t, spamd_var_run_t, spamd_spool_t;
-+ ')
-+
-+ stream_connect_pattern($1, spamd_var_run_t, spamd_var_run_t, spamd_t)
-+')
-+
-+########################################
-+##
-+## All of the rules required to administrate
-+## an spamassassin environment
-+##
-+##
-+##
-+## Domain allowed access.
-+##
-+##
-+##
-+##
-+## The role to be allowed to manage the spamassassin domain.
-+##
-+##
-+##
-+#
-+interface(`spamassassin_spamd_admin',`
-+ gen_require(`
-+ type spamd_t, spamd_tmp_t, spamd_log_t;
-+ type spamd_spool_t, spamd_var_lib_t, spamd_var_run_t;
-+ type spamd_initrc_exec_t;
-+ ')
-+
-+ allow $1 spamd_t:process { ptrace signal_perms getattr };
-+ read_files_pattern($1, spamd_t, spamd_t)
-+
-+ init_labeled_script_domtrans($1, spamd_initrc_exec_t)
-+ domain_system_change_exemption($1)
-+ role_transition $2 spamd_initrc_exec_t system_r;
-+ allow $2 system_r;
-+
-+ files_list_tmp($1)
-+ admin_pattern($1, spamd_tmp_t)
-+
-+ logging_list_logs($1)
-+ admin_pattern($1, spamd_log_t)
-+
-+ files_list_spool($1)
-+ admin_pattern($1, spamd_spool_t)
-+
-+ files_list_var_lib($1)
-+ admin_pattern($1, spamd_var_lib_t)
-+
-+ files_list_pids($1)
-+ admin_pattern($1, spamd_var_run_t)
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-3.7.15/policy/modules/services/spamassassin.te
---- nsaserefpolicy/policy/modules/services/spamassassin.te 2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/spamassassin.te 2010-03-18 10:44:43.000000000 -0400
-@@ -20,6 +20,35 @@
- ##
- gen_tunable(spamd_enable_home_dirs, true)
-
-+ifdef(`distro_redhat',`
-+# spamassassin client executable
-+type spamc_t;
-+type spamc_exec_t;
-+application_domain(spamc_t, spamc_exec_t)
-+role system_r types spamc_t;
-+
-+type spamd_etc_t;
-+files_config_file(spamd_etc_t)
-+
-+typealias spamc_exec_t alias spamassassin_exec_t;
-+typealias spamc_t alias spamassassin_t;
-+
-+type spamc_home_t;
-+userdom_user_home_content(spamc_home_t)
-+typealias spamc_home_t alias { spamassassin_home_t user_spamassassin_home_t staff_spamassassin_home_t sysadm_spamassassin_home_t };
-+typealias spamc_home_t alias { auditadm_spamassassin_home_t secadm_spamassassin_home_t };
-+typealias spamc_home_t alias { user_spamc_home_t staff_spamc_home_t sysadm_spamc_home_t };
-+typealias spamc_home_t alias { auditadm_spamc_home_t secadm_spamc_home_t };
-+
-+type spamc_tmp_t;
-+files_tmp_file(spamc_tmp_t)
-+typealias spamc_tmp_t alias spamassassin_tmp_t;
-+typealias spamc_tmp_t alias { user_spamassassin_tmp_t staff_spamassassin_tmp_t sysadm_spamassassin_tmp_t };
-+typealias spamc_tmp_t alias { auditadm_spamassassin_tmp_t secadm_spamassassin_tmp_t };
-+
-+typealias spamc_tmp_t alias { user_spamc_tmp_t staff_spamc_tmp_t sysadm_spamc_tmp_t };
-+typealias spamc_tmp_t alias { auditadm_spamc_tmp_t secadm_spamc_tmp_t };
-+', `
- type spamassassin_t;
- type spamassassin_exec_t;
- typealias spamassassin_t alias { user_spamassassin_t staff_spamassassin_t sysadm_spamassassin_t };
-@@ -51,10 +80,21 @@
- typealias spamc_tmp_t alias { auditadm_spamc_tmp_t secadm_spamc_tmp_t };
- files_tmp_file(spamc_tmp_t)
- ubac_constrained(spamc_tmp_t)
-+')
-
- type spamd_t;
- type spamd_exec_t;
- init_daemon_domain(spamd_t, spamd_exec_t)
-+can_exec(spamd_t, spamd_exec_t)
-+
-+type spamd_compiled_t;
-+files_type(spamd_compiled_t)
-+
-+type spamd_initrc_exec_t;
-+init_script_file(spamd_initrc_exec_t)
-+
-+type spamd_log_t;
-+logging_log_file(spamd_log_t)
-
- type spamd_spool_t;
- files_type(spamd_spool_t)
-@@ -110,6 +150,7 @@
- dev_read_urand(spamassassin_t)
-
- fs_search_auto_mountpoints(spamassassin_t)
-+fs_getattr_all_fs(spamassassin_t)
-
- # this should probably be removed
- corecmd_list_bin(spamassassin_t)
-@@ -150,6 +191,9 @@
- corenet_udp_sendrecv_all_ports(spamassassin_t)
- corenet_tcp_connect_all_ports(spamassassin_t)
- corenet_sendrecv_all_client_packets(spamassassin_t)
-+ corenet_udp_bind_generic_node(spamassassin_t)
-+ corenet_udp_bind_generic_port(spamassassin_t)
-+ corenet_dontaudit_udp_bind_all_ports(spamassassin_t)
-
- sysnet_read_config(spamassassin_t)
- ')
-@@ -186,6 +230,8 @@
- optional_policy(`
- mta_read_config(spamassassin_t)
- sendmail_stub(spamassassin_t)
-+ sendmail_dontaudit_rw_unix_stream_sockets(spamassassin_t)
-+ sendmail_dontaudit_rw_tcp_sockets(spamassassin_t)
- ')
-
- ########################################
-@@ -207,16 +253,33 @@
- allow spamc_t self:unix_stream_socket connectto;
- allow spamc_t self:tcp_socket create_stream_socket_perms;
- allow spamc_t self:udp_socket create_socket_perms;
-+corenet_all_recvfrom_unlabeled(spamc_t)
-+corenet_all_recvfrom_netlabel(spamc_t)
-+corenet_tcp_sendrecv_generic_if(spamc_t)
-+corenet_tcp_sendrecv_generic_node(spamc_t)
-+corenet_tcp_connect_spamd_port(spamc_t)
-+
-+can_exec(spamc_t, spamc_exec_t)
-
- manage_dirs_pattern(spamc_t, spamc_tmp_t, spamc_tmp_t)
- manage_files_pattern(spamc_t, spamc_tmp_t, spamc_tmp_t)
- files_tmp_filetrans(spamc_t, spamc_tmp_t, { file dir })
-
-+manage_dirs_pattern(spamc_t, spamc_home_t, spamc_home_t)
-+manage_files_pattern(spamc_t, spamc_home_t, spamc_home_t)
-+manage_lnk_files_pattern(spamc_t, spamc_home_t, spamc_home_t)
-+manage_fifo_files_pattern(spamc_t, spamc_home_t, spamc_home_t)
-+manage_sock_files_pattern(spamc_t, spamc_home_t, spamc_home_t)
-+userdom_user_home_dir_filetrans(spamc_t, spamc_home_t, { dir file lnk_file sock_file fifo_file })
-+userdom_append_user_home_content_files(spamc_t)
-+
- # Allow connecting to a local spamd
- allow spamc_t spamd_t:unix_stream_socket connectto;
- allow spamc_t spamd_tmp_t:sock_file rw_sock_file_perms;
-+spamd_stream_connect(spamc_t)
-
- kernel_read_kernel_sysctls(spamc_t)
-+kernel_read_system_state(spamc_t)
-
- corenet_all_recvfrom_unlabeled(spamc_t)
- corenet_all_recvfrom_netlabel(spamc_t)
-@@ -246,9 +309,16 @@
- files_dontaudit_search_var(spamc_t)
- # cjp: this may be removable:
- files_list_home(spamc_t)
-+files_list_var_lib(spamc_t)
-+list_dirs_pattern(spamc_t, spamd_var_lib_t, spamd_var_lib_t)
-+read_files_pattern(spamc_t, spamd_var_lib_t, spamd_var_lib_t)
-+
-+fs_search_auto_mountpoints(spamc_t)
-
- logging_send_syslog_msg(spamc_t)
-
-+auth_use_nsswitch(spamc_t)
-+
- miscfiles_read_localization(spamc_t)
-
- # cjp: this should probably be removed:
-@@ -256,27 +326,40 @@
-
- sysnet_read_config(spamc_t)
-
-+tunable_policy(`use_nfs_home_dirs',`
-+ fs_manage_nfs_dirs(spamc_t)
-+ fs_manage_nfs_files(spamc_t)
-+ fs_manage_nfs_symlinks(spamc_t)
-+')
-+
-+tunable_policy(`use_samba_home_dirs',`
-+ fs_manage_cifs_dirs(spamc_t)
-+ fs_manage_cifs_files(spamc_t)
-+ fs_manage_cifs_symlinks(spamc_t)
-+')
-+
- optional_policy(`
- # Allow connection to spamd socket above
- evolution_stream_connect(spamc_t)
- ')
-
- optional_policy(`
-- # Needed for pyzor/razor called from spamd
- milter_manage_spamass_state(spamc_t)
- ')
-
- optional_policy(`
-- nis_use_ypbind(spamc_t)
--')
--
--optional_policy(`
-- nscd_socket_use(spamc_t)
-+ postfix_domtrans_postdrop(spamc_t)
-+ postfix_search_spool(spamc_t)
-+ postfix_rw_local_pipes(spamc_t)
- ')
-
- optional_policy(`
-+ mta_send_mail(spamc_t)
- mta_read_config(spamc_t)
-+ mta_read_queue(spamc_t)
- sendmail_stub(spamc_t)
-+ sendmail_rw_pipes(spamc_t)
-+ sendmail_dontaudit_rw_tcp_sockets(spamc_t)
- ')
-
- ########################################
-@@ -288,7 +371,7 @@
- # setuids to the user running spamc. Comment this if you are not
- # using this ability.
-
--allow spamd_t self:capability { setuid setgid dac_override sys_tty_config };
-+allow spamd_t self:capability { kill setuid setgid dac_override sys_tty_config };
- dontaudit spamd_t self:capability sys_tty_config;
- allow spamd_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
- allow spamd_t self:fd use;
-@@ -304,10 +387,17 @@
- allow spamd_t self:unix_stream_socket connectto;
- allow spamd_t self:tcp_socket create_stream_socket_perms;
- allow spamd_t self:udp_socket create_socket_perms;
--allow spamd_t self:netlink_route_socket r_netlink_socket_perms;
-+
-+can_exec(spamd_t, spamd_compiled_t)
-+manage_dirs_pattern(spamd_t, spamd_compiled_t, spamd_compiled_t)
-+manage_files_pattern(spamd_t, spamd_compiled_t, spamd_compiled_t)
-+
-+manage_files_pattern(spamd_t, spamd_log_t, spamd_log_t)
-+logging_log_filetrans(spamd_t, spamd_log_t, file)
-
- manage_dirs_pattern(spamd_t, spamd_spool_t, spamd_spool_t)
- manage_files_pattern(spamd_t, spamd_spool_t, spamd_spool_t)
-+manage_sock_files_pattern(spamd_t, spamd_spool_t, spamd_spool_t)
- files_spool_filetrans(spamd_t, spamd_spool_t, { file dir })
-
- manage_dirs_pattern(spamd_t, spamd_tmp_t, spamd_tmp_t)
-@@ -316,10 +406,12 @@
-
- # var/lib files for spamd
- allow spamd_t spamd_var_lib_t:dir list_dir_perms;
--read_files_pattern(spamd_t, spamd_var_lib_t, spamd_var_lib_t)
-+manage_files_pattern(spamd_t, spamd_var_lib_t, spamd_var_lib_t)
-+manage_lnk_files_pattern(spamd_t, spamd_var_lib_t, spamd_var_lib_t)
-
- manage_dirs_pattern(spamd_t, spamd_var_run_t, spamd_var_run_t)
- manage_files_pattern(spamd_t, spamd_var_run_t, spamd_var_run_t)
-+manage_sock_files_pattern(spamd_t, spamd_var_run_t, spamd_var_run_t)
- files_pid_filetrans(spamd_t, spamd_var_run_t, { dir file })
-
- kernel_read_all_sysctls(spamd_t)
-@@ -369,22 +461,27 @@
-
- init_dontaudit_rw_utmp(spamd_t)
-
-+auth_use_nsswitch(spamd_t)
-+
- logging_send_syslog_msg(spamd_t)
-
- miscfiles_read_localization(spamd_t)
-
--sysnet_read_config(spamd_t)
--sysnet_use_ldap(spamd_t)
--sysnet_dns_name_resolve(spamd_t)
--
- userdom_use_unpriv_users_fds(spamd_t)
- userdom_search_user_home_dirs(spamd_t)
-
-+optional_policy(`
-+ exim_manage_spool_dirs(spamd_t)
-+ exim_manage_spool_files(spamd_t)
-+')
-+
- tunable_policy(`use_nfs_home_dirs',`
-+ fs_manage_nfs_dirs(spamd_t)
- fs_manage_nfs_files(spamd_t)
- ')
-
- tunable_policy(`use_samba_home_dirs',`
-+ fs_manage_cifs_dirs(spamd_t)
- fs_manage_cifs_files(spamd_t)
- ')
-
-@@ -401,24 +498,18 @@
- ')
-
- optional_policy(`
-+ dcc_domtrans_cdcc(spamd_t)
- dcc_domtrans_client(spamd_t)
-+ dcc_signal_client(spamd_t)
- dcc_stream_connect_dccifd(spamd_t)
- ')
-
- optional_policy(`
-- milter_manage_spamass_state(spamd_t)
--')
--
--optional_policy(`
- mysql_search_db(spamd_t)
- mysql_stream_connect(spamd_t)
- ')
-
- optional_policy(`
-- nis_use_ypbind(spamd_t)
--')
--
--optional_policy(`
- postfix_read_config(spamd_t)
- ')
-
-@@ -433,6 +524,10 @@
-
- optional_policy(`
- razor_domtrans(spamd_t)
-+ razor_read_lib_files(spamd_t)
-+ tunable_policy(`spamd_enable_home_dirs',`
-+ razor_manage_user_home_files(spamd_t)
-+ ')
- ')
-
- optional_policy(`
-@@ -445,5 +540,9 @@
- ')
-
- optional_policy(`
-+ milter_manage_spamass_state(spamd_t)
-+')
-+
-+optional_policy(`
- udev_read_db(spamd_t)
- ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-3.7.15/policy/modules/services/squid.te
---- nsaserefpolicy/policy/modules/services/squid.te 2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.15/policy/modules/services/squid.te 2010-03-18 10:44:43.000000000 -0400
-@@ -14,6 +14,13 @@
- ##