Changes to the user domain policy module

gnome_role is deprecated, use gnome_role_template instead
depends on dbus because of gkeyringd

Signed-off-by: Dominick Grift <dominick.grift@gmail.com>

policy/modules/roles/staff.te

@@ -78,6 +78,10 @@ ifndef(`distro_redhat',`
 
 	optional_policy(`
 		dbus_role_template(staff, staff_r, staff_t)
+
+		optional_policy(`
+			gnome_role_template(staff, staff_r, staff_t)
+		')
 	')
 
 	optional_policy(`
@@ -92,10 +96,6 @@ ifndef(`distro_redhat',`
 		gift_role(staff_r, staff_t)
 	')
 
-	optional_policy(`
-		gnome_role(staff_r, staff_t)
-	')
-
 	optional_policy(`
 		gpg_role(staff_r, staff_t)
 	')

policy/modules/roles/sysadm.te

@@ -444,6 +444,10 @@ ifndef(`distro_redhat',`
 
 	optional_policy(`
 		dbus_role_template(sysadm, sysadm_r, sysadm_t)
+
+		optional_policy(`
+			gnome_role_template(sysadm, sysadm_r, sysadm_t)
+		')
 	')
 
 	optional_policy(`
@@ -458,10 +462,6 @@ ifndef(`distro_redhat',`
 		gift_role(sysadm_r, sysadm_t)
 	')
 
-	optional_policy(`
-		gnome_role(sysadm_r, sysadm_t)
-	')
-
 	optional_policy(`
 		gpg_role(sysadm_r, sysadm_t)
 	')

policy/modules/roles/unprivuser.te

@@ -51,6 +51,10 @@ ifndef(`distro_redhat',`
 
 	optional_policy(`
 		dbus_role_template(user, user_r, user_t)
+
+		optional_policy(`
+			gnome_role_template(user, user_r, user_t)
+		')
 	')
 
 	optional_policy(`
@@ -65,10 +69,6 @@ ifndef(`distro_redhat',`
 		gift_role(user_r, user_t)
 	')
 
-	optional_policy(`
-		gnome_role(user_r, user_t)
-	')
-
 	optional_policy(`
 		gpg_role(user_r, user_t)
 	')

policy/modules/system/userdomain.if

@@ -910,6 +910,10 @@ template(`userdom_restricted_xwindows_user_template',`
 			cups_dbus_chat($1_t)
 		')
 
+		optional_policy(`
+			gnome_role_template($1, $1_r, $1_t)
+		')
+
 		optional_policy(`
 			wm_role_template($1, $1_r, $1_t)
 		')