UPdate for f14 policy

[people/stevee/selinux-policy.git] / policy / modules / services / ucspitcp.te

diff --git a/policy/modules/services/ucspitcp.te b/policy/modules/services/ucspitcp.te
index 0077c4c93758ffa7f4038a193775edd49455768e..dd23a9ce2f4981b9525b5d1c701929b8cf300709 100644 (file)
--- a/policy/modules/services/ucspitcp.te
+++ b/policy/modules/services/ucspitcp.te
@@ -1,5 +1,4 @@
-
-policy_module(ucspitcp, 1.2.0)
+policy_module(ucspitcp, 1.3.0)
 
 ########################################
 #
@@ -27,21 +26,18 @@ corecmd_search_bin(rblsmtpd_t)
 
 corenet_all_recvfrom_unlabeled(rblsmtpd_t)
 corenet_all_recvfrom_netlabel(rblsmtpd_t)
-corenet_tcp_sendrecv_all_if(rblsmtpd_t)
-corenet_udp_sendrecv_all_if(rblsmtpd_t)
-corenet_tcp_sendrecv_all_nodes(rblsmtpd_t)
-corenet_udp_sendrecv_all_nodes(rblsmtpd_t)
+corenet_tcp_sendrecv_generic_if(rblsmtpd_t)
+corenet_udp_sendrecv_generic_if(rblsmtpd_t)
+corenet_tcp_sendrecv_generic_node(rblsmtpd_t)
+corenet_udp_sendrecv_generic_node(rblsmtpd_t)
 corenet_tcp_sendrecv_all_ports(rblsmtpd_t)
 corenet_udp_sendrecv_all_ports(rblsmtpd_t)
-corenet_tcp_bind_all_nodes(rblsmtpd_t)
+corenet_tcp_bind_generic_node(rblsmtpd_t)
 corenet_udp_bind_generic_port(rblsmtpd_t)
 
 files_read_etc_files(rblsmtpd_t)
 files_search_var(rblsmtpd_t)
 
-libs_use_ld_so(rblsmtpd_t)
-libs_use_shared_libs(rblsmtpd_t)
-
 optional_policy(`
        daemontools_ipc_domain(rblsmtpd_t)
 ')
@@ -52,7 +48,7 @@ optional_policy(`
 #
 
 allow ucspitcp_t self:capability { setgid setuid };
-allow ucspitcp_t self:fifo_file { read write };
+allow ucspitcp_t self:fifo_file rw_fifo_file_perms;
 allow ucspitcp_t self:tcp_socket create_stream_socket_perms;
 allow ucspitcp_t self:udp_socket create_socket_perms;
 
@@ -61,14 +57,14 @@ corecmd_search_bin(ucspitcp_t)
 # base networking:
 corenet_all_recvfrom_unlabeled(ucspitcp_t)
 corenet_all_recvfrom_netlabel(ucspitcp_t)
-corenet_tcp_sendrecv_all_if(ucspitcp_t)
-corenet_udp_sendrecv_all_if(ucspitcp_t)
-corenet_tcp_sendrecv_all_nodes(ucspitcp_t)
-corenet_udp_sendrecv_all_nodes(ucspitcp_t)
+corenet_tcp_sendrecv_generic_if(ucspitcp_t)
+corenet_udp_sendrecv_generic_if(ucspitcp_t)
+corenet_tcp_sendrecv_generic_node(ucspitcp_t)
+corenet_udp_sendrecv_generic_node(ucspitcp_t)
 corenet_tcp_sendrecv_all_ports(ucspitcp_t)
 corenet_udp_sendrecv_all_ports(ucspitcp_t)
-corenet_tcp_bind_all_nodes(ucspitcp_t)
-corenet_udp_bind_all_nodes(ucspitcp_t)
+corenet_tcp_bind_generic_node(ucspitcp_t)
+corenet_udp_bind_generic_node(ucspitcp_t)
 
 # server ports:
 corenet_tcp_bind_ftp_port(ucspitcp_t)
@@ -89,12 +85,14 @@ corenet_sendrecv_generic_server_packets(ucspitcp_t)
 files_search_var(ucspitcp_t)
 files_read_etc_files(ucspitcp_t)
 
-libs_use_ld_so(ucspitcp_t)
-libs_use_shared_libs(ucspitcp_t)
-
 sysnet_read_config(ucspitcp_t)
 
 optional_policy(`
-       daemontools_service_domain(ucspitcp_t,ucspitcp_exec_t)
+       daemontools_service_domain(ucspitcp_t, ucspitcp_exec_t)
        daemontools_read_svc(ucspitcp_t)
 ')
+
+optional_policy(`
+    daemontools_sigchld_run(ucspitcp_t)
+')
+