separate out the nsplugin typealiases in mozilla.te

diff --git a/policy/modules/apps/mozilla.fc b/policy/modules/apps/mozilla.fc
index 800b5c882d4402eebadf94f8c545d5ddc68afad8..4c0895ecf0995f542852669a505f59e40f19ee9c 100644 (file)
--- a/policy/modules/apps/mozilla.fc
+++ b/policy/modules/apps/mozilla.fc
@@ -20,9 +20,11 @@ HOME_DIR/\.icedteaplugin(/.*)?               gen_context(system_u:object_r:mozilla_home_t,s0)
 /usr/bin/epiphany              --      gen_context(system_u:object_r:mozilla_exec_t,s0)
 /usr/bin/mozilla-[0-9].*       --      gen_context(system_u:object_r:mozilla_exec_t,s0)
 /usr/bin/mozilla-bin-[0-9].*   --      gen_context(system_u:object_r:mozilla_exec_t,s0)
+ifdef(`distro_redhat',`
 /usr/bin/nspluginscan          --      gen_context(system_u:object_r:mozilla_plugin_exec_t,s0)
 /usr/bin/nspluginviewer                --      gen_context(system_u:object_r:mozilla_plugin_exec_t,s0)
 /usr/lib/nspluginwrapper/npviewer.bin  --      gen_context(system_u:object_r:mozilla_plugin_exec_t,s0)
+')
 
 #
 # /lib
@@ -40,4 +42,6 @@ HOME_DIR/\.icedteaplugin(/.*)?                gen_context(system_u:object_r:mozilla_home_t,s0)
 
 /usr/lib/mozilla/plugins-wrapped(/.*)?                 gen_context(system_u:object_r:mozilla_plugin_rw_t,s0)
 
+ifdef(`distro_redhat',`
 /usr/lib/nspluginwrapper/plugin-config                 --      gen_context(system_u:object_r:mozilla_plugin_config_exec_t,s0)
+')

diff --git a/policy/modules/apps/mozilla.te b/policy/modules/apps/mozilla.te
index bb90a3b354dd2db385e1d884127913b6d165729f..04159deebc883d4397b5536017ba492e751df282 100644 (file)
--- a/policy/modules/apps/mozilla.te
+++ b/policy/modules/apps/mozilla.te
@@ -23,7 +23,7 @@ type mozilla_conf_t;
 files_config_file(mozilla_conf_t)
 
 type mozilla_home_t;
-typealias mozilla_home_t alias { user_mozilla_home_t staff_mozilla_home_t sysadm_mozilla_home_t nsplugin_home_t };
+typealias mozilla_home_t alias { user_mozilla_home_t staff_mozilla_home_t sysadm_mozilla_home_t };
 typealias mozilla_home_t alias { auditadm_mozilla_home_t secadm_mozilla_home_t };
 files_poly_member(mozilla_home_t)
 userdom_user_home_content(mozilla_home_t)
@@ -43,7 +43,7 @@ userdom_user_tmpfs_content(mozilla_plugin_tmpfs_t)
 files_tmpfs_file(mozilla_plugin_tmpfs_t)
 ubac_constrained(mozilla_plugin_tmpfs_t)
 
-type mozilla_plugin_rw_t alias nsplugin_rw_t;
+type mozilla_plugin_rw_t;
 files_type(mozilla_plugin_rw_t)
 
 type mozilla_plugin_config_t;
@@ -545,3 +545,12 @@ domtrans_pattern(mozilla_plugin_config_t, mozilla_plugin_exec_t, mozilla_plugin_
 optional_policy(`
        xserver_use_user_fonts(mozilla_plugin_config_t)
 ')
+ifdef(`distro_redhat',`
+       typealias mozilla_plugin_t  alias nsplugin_t;
+       typealias mozilla_plugin_exec_t  alias nsplugin_exec_t;
+       typealias mozilla_plugin_rw_t alias nsplugin_rw_t;
+       typealias mozilla_plugin_tmp_t  alias nsplugin_tmp_t;
+       typealias mozilla_home_t alias nsplugin_home_t;
+       typealias mozilla_plugin_config_t  alias nsplugin_config_t;
+       typealias mozilla_plugin_config_exec_t  alias nsplugin_config_exec_t;
+')