RepoMirrors
/
selinux-refpolicy
mirror of https://github.com/SELinuxProject/refpolicy
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Dominick Grift 2012-10-22 14:48:22 +02:00 committed by Chris PeBenito
parent 4c68e48950
commit 83d28d8a52
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
policy/modules/roles/staff.te
View File

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

8
policy/modules/roles/sysadm.te
View File

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

8
policy/modules/roles/unprivuser.te
View File

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

4
policy/modules/system/userdomain.if
View File

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