subsonic: handle both subsonic_ro_t and public_content_rw_t consistently

diff --git a/subsonic/subsonic.te b/subsonic/subsonic.te
index 0b8aa93..b498825 100644 (file)
--- a/subsonic/subsonic.te
+++ b/subsonic/subsonic.te
@@ -1,4 +1,4 @@
-policy_module(subsonic, 0.1.69)
+policy_module(subsonic, 0.1.73)

 
 require {
     type init_t;
 
 require {
     type init_t;


@@ -46,20 +46,23 @@ _sky_java_process(subsonic_t)
 
 read_files_pattern(subsonic_t, subsonic_ro_t, subsonic_ro_t)
 read_lnk_files_pattern(subsonic_t, subsonic_ro_t, subsonic_ro_t)
 
 read_files_pattern(subsonic_t, subsonic_ro_t, subsonic_ro_t)
 read_lnk_files_pattern(subsonic_t, subsonic_ro_t, subsonic_ro_t)

+mmap_files_pattern(subsonic_t, subsonic_ro_t, subsonic_ro_t)
+

 read_files_pattern(subsonic_t, public_content_t, public_content_t)
 read_lnk_files_pattern(subsonic_t, public_content_t, public_content_t)
 read_files_pattern(subsonic_t, public_content_t, public_content_t)
 read_lnk_files_pattern(subsonic_t, public_content_t, public_content_t)

-mmap_files_pattern(subsonic_t, subsonic_ro_t, subsonic_ro_t)
+mmap_files_pattern(subsonic_t, public_content_t, public_content_t)

 
 manage_files_pattern(subsonic_t, subsonic_rw_t, subsonic_rw_t)
 manage_dirs_pattern(subsonic_t, subsonic_rw_t, subsonic_rw_t)
 manage_lnk_files_pattern(subsonic_t, subsonic_rw_t, subsonic_rw_t)
 
 manage_files_pattern(subsonic_t, subsonic_rw_t, subsonic_rw_t)
 manage_dirs_pattern(subsonic_t, subsonic_rw_t, subsonic_rw_t)
 manage_lnk_files_pattern(subsonic_t, subsonic_rw_t, subsonic_rw_t)

-manage_files_pattern(subsonic_t, public_content_rw_t, public_content_rw_t)

 mmap_files_pattern(subsonic_t, subsonic_rw_t, subsonic_rw_t)
 
 mmap_files_pattern(subsonic_t, subsonic_rw_t, subsonic_rw_t)
 

+manage_files_pattern(subsonic_t, public_content_rw_t, public_content_rw_t)
+mmap_files_pattern(subsonic_t, public_content_rw_t, public_content_rw_t)
+

 sysnet_dns_name_resolve(subsonic_t)
 
 sssd_read_public_files(subsonic_t)
 
 dev_read_rand(subsonic_t)
 dev_read_sysfs(subsonic_t)
 sysnet_dns_name_resolve(subsonic_t)
 
 sssd_read_public_files(subsonic_t)
 
 dev_read_rand(subsonic_t)
 dev_read_sysfs(subsonic_t)

-