Upstream calls the gnomedomain rather then gnome_domain

diff --git a/policy/modules/apps/gnome.if b/policy/modules/apps/gnome.if
index 8fe4b662a642c55047fcbaf8ecaf56de1c8e429a..787d49f8d757babf92eb3fd5d8641233b3d5d720 100644 (file)
--- a/policy/modules/apps/gnome.if
+++ b/policy/modules/apps/gnome.if
@@ -58,13 +58,13 @@ interface(`gnome_role',`
 interface(`gnome_role_gkeyringd',`
         gen_require(`
                 attribute gkeyringd_domain;
-                attribute gnome_domain;
+                attribute gnomedomain;
                 type gnome_home_t;
                 type gkeyringd_exec_t, gkeyringd_tmp_t, gkeyringd_gnome_home_t;
                class dbus send_msg;
         ')
 
-       type $1_gkeyringd_t, gnome_domain, gkeyringd_domain;
+       type $1_gkeyringd_t, gnomedomain, gkeyringd_domain;
        typealias $1_gkeyringd_t alias gkeyringd_$1_t;
        application_domain($1_gkeyringd_t, gkeyringd_exec_t)
        ubac_constrained($1_gkeyringd_t)
@@ -261,10 +261,10 @@ interface(`gnome_manage_config',`
 #
 interface(`gnome_signal_all',`
        gen_require(`
-               attribute gnome_domain;
+               attribute gnomedomain;
        ')
 
-       allow $1 gnome_domain:process signal;
+       allow $1 gnomedomain:process signal;
 ')
 
 ########################################

diff --git a/policy/modules/apps/gnome.te b/policy/modules/apps/gnome.te
index 14d7e30bcebd365fe7bb6ba52bea500f4d9f0396..3c5d7921a22de7c99b5c032e19f4f084ed299bbf 100644 (file)
--- a/policy/modules/apps/gnome.te
+++ b/policy/modules/apps/gnome.te
@@ -5,7 +5,7 @@ policy_module(gnome, 2.1.0)
 # Declarations
 #
 
-attribute gnome_domain;
+attribute gnomedomain;
 attribute gnome_home_type;
 attribute gkeyringd_domain;
 
@@ -40,7 +40,7 @@ typealias gconf_tmp_t alias unconfined_gconf_tmp_t;
 files_tmp_file(gconf_tmp_t)
 ubac_constrained(gconf_tmp_t)
 
-type gconfd_t, gnome_domain;
+type gconfd_t, gnomedomain;
 type gconfd_exec_t;
 typealias gconfd_t alias { user_gconfd_t staff_gconfd_t sysadm_gconfd_t };
 typealias gconfd_t alias { auditadm_gconfd_t secadm_gconfd_t };
@@ -257,7 +257,7 @@ optional_policy(`
        ssh_read_user_home_files(gkeyringd_domain)
 ')
 
-domain_use_interactive_fds(gnome_domain)
+domain_use_interactive_fds(gnomedomain)
 
-userdom_use_inherited_user_terminals(gnome_domain)
+userdom_use_inherited_user_terminals(gnomedomain)