From 83d28d8a5254b8db3de3119ce2021f9ccf93c51c Mon Sep 17 00:00:00 2001 From: Dominick Grift Date: Mon, 22 Oct 2012 14:48:22 +0200 Subject: [PATCH] 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 --- policy/modules/roles/staff.te | 8 ++++---- policy/modules/roles/sysadm.te | 8 ++++---- policy/modules/roles/unprivuser.te | 8 ++++---- policy/modules/system/userdomain.if | 4 ++++ 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/policy/modules/roles/staff.te b/policy/modules/roles/staff.te index e5aee974e..3e7b9ac90 100644 --- a/policy/modules/roles/staff.te +++ b/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) ') diff --git a/policy/modules/roles/sysadm.te b/policy/modules/roles/sysadm.te index 44c198a51..1deb19763 100644 --- a/policy/modules/roles/sysadm.te +++ b/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) ') diff --git a/policy/modules/roles/unprivuser.te b/policy/modules/roles/unprivuser.te index 9f6d4c3e5..2d63b2227 100644 --- a/policy/modules/roles/unprivuser.te +++ b/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) ') diff --git a/policy/modules/system/userdomain.if b/policy/modules/system/userdomain.if index 275bd2b53..b487e9999 100644 --- a/policy/modules/system/userdomain.if +++ b/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) ')