Fix merge

diff --git a/policy/modules/apps/mozilla.te b/policy/modules/apps/mozilla.te
index fa47a1ffa77df4e0fd2bd797482205f1b9edc3a4..319c66a8e705d509b6f58c17bd8492e53965f534 100644 (file)
--- a/policy/modules/apps/mozilla.te
+++ b/policy/modules/apps/mozilla.te
@@ -342,7 +342,7 @@ corenet_tcp_connect_http_cache_port(mozilla_plugin_t)
 corenet_tcp_connect_squid_port(mozilla_plugin_t)
 corenet_tcp_connect_ipp_port(mozilla_plugin_t)
 corenet_tcp_connect_speech_port(mozilla_plugin_t)
-corenet_tcp_connect_rtsp_port(mozilla_plugin_t)
+corenet_tcp_connect_streaming_port(mozilla_plugin_t)
 corenet_tcp_bind_generic_node(mozilla_plugin_t)
 corenet_udp_bind_generic_node(mozilla_plugin_t)
 

diff --git a/policy/modules/kernel/corenetwork.te.in b/policy/modules/kernel/corenetwork.te.in
index 8970e676f80b48ac98edc75e10932eccccf25745..14fc7289bf9aac69df3b83eec628f82770e60a7b 100644 (file)
--- a/policy/modules/kernel/corenetwork.te.in
+++ b/policy/modules/kernel/corenetwork.te.in
@@ -214,7 +214,6 @@ network_port(rndc, tcp,953,s0)
 network_port(router, udp,520-521,s0, tcp,521,s0)
 network_port(rsh, tcp,514,s0)
 network_port(rsync, tcp,873,s0, udp,873,s0)
-network_port(rtsp, tcp,554,s0, udp,554,s0)
 network_port(rwho, udp,513,s0)
 network_port(sap, tcp,9875,s0, udp,9875,s0)
 network_port(sametime, tcp,1533,s0, udp,1533,s0)

diff --git a/policy/modules/services/dirsrv.te b/policy/modules/services/dirsrv.te
index e7ba06e7c4177ea864a80e6db2f5aa69098abd6b..5df774ffe6082eb305fc1695245d0e1170281f25 100644 (file)
--- a/policy/modules/services/dirsrv.te
+++ b/policy/modules/services/dirsrv.te
@@ -163,10 +163,6 @@ miscfiles_read_localization(dirsrv_snmp_t)
 sysnet_read_config(dirsrv_snmp_t)
 sysnet_dns_name_resolve(dirsrv_snmp_t)
 
-optional_policy(`
-    kerberos_use(dirsrv_t)
-')
-
 optional_policy(`
        snmp_dontaudit_read_snmp_var_lib_files(dirsrv_snmp_t)
        snmp_dontaudit_write_snmp_var_lib_files(dirsrv_snmp_t)