[gentoo-commits] proj/hardened-refpolicy:next commit in: policy/modules/roles/

[Jason Zaman]

commit:     1c05ab474a015637a094f5237c454b104acd531a
Author:     Guido Trentalancia <guido <AT> trentalancia <DOT> net>
AuthorDate: Mon Dec 19 23:48:46 2016 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sun Jan  1 16:26:28 2017 +0000
URL:        https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=1c05ab47

base: enable the xscreensaver role

This patch enables the xscreensaver role so that the
xscreensaver module is used on those systems where the
corresponding application is installed.

Signed-off-by: Guido Trentalancia <guido <AT> trentalancia.net>

 policy/modules/roles/staff.te      | 4 ++++
 policy/modules/roles/sysadm.te     | 4 ++++
 policy/modules/roles/unprivuser.te | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/policy/modules/roles/staff.te b/policy/modules/roles/staff.te
index db93894..a528f99 100644
--- a/policy/modules/roles/staff.te
+++ b/policy/modules/roles/staff.te
@@ -60,6 +60,10 @@ optional_policy(`
 ')
 
 optional_policy(`
+	xscreensaver_role(staff_r, staff_t)
+')
+
+optional_policy(`
 	xserver_role(staff_r, staff_t)
 ')
 

diff --git a/policy/modules/roles/sysadm.te b/policy/modules/roles/sysadm.te
index 8b8a687..286d088 100644
--- a/policy/modules/roles/sysadm.te
+++ b/policy/modules/roles/sysadm.te
@@ -1199,6 +1199,10 @@ optional_policy(`
 ')
 
 optional_policy(`
+	xscreensaver_role(sysadm_r, sysadm_t)
+')
+
+optional_policy(`
 	xserver_role(sysadm_r, sysadm_t)
 ')
 

diff --git a/policy/modules/roles/unprivuser.te b/policy/modules/roles/unprivuser.te
index da8fbc7..f0c990d 100644
--- a/policy/modules/roles/unprivuser.te
+++ b/policy/modules/roles/unprivuser.te
@@ -29,6 +29,10 @@ optional_policy(`
 ')
 
 optional_policy(`
+	xscreensaver_role(user_r, user_t)
+')
+
+optional_policy(`
 	xserver_role(user_r, user_t)
 ')