From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 1F891138010 for ; Wed, 24 Oct 2012 17:48:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A46CEE0462; Wed, 24 Oct 2012 17:48:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 29123E0462 for ; Wed, 24 Oct 2012 17:48:35 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1D85733D8BA for ; Wed, 24 Oct 2012 17:48:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 57C15E5436 for ; Wed, 24 Oct 2012 17:48:33 +0000 (UTC) From: "Sven Vermeulen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sven Vermeulen" Message-ID: <1351100738.e17b083270c37d0a0d4c8f9ffadd644d2783f05e.SwifT@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/roles/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: policy/modules/roles/staff.te policy/modules/roles/sysadm.te policy/modules/roles/unprivuser.te X-VCS-Directories: policy/modules/roles/ X-VCS-Committer: SwifT X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: e17b083270c37d0a0d4c8f9ffadd644d2783f05e X-VCS-Branch: master Date: Wed, 24 Oct 2012 17:48:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6e1ac205-face-454f-a75f-81c195be4d54 X-Archives-Hash: 33af4d045c3a09fac2971b1ab2daf179 commit: e17b083270c37d0a0d4c8f9ffadd644d2783f05e Author: Sven Vermeulen siphos be> AuthorDate: Wed Oct 24 17:45:38 2012 +0000 Commit: Sven Vermeulen siphos be> CommitDate: Wed Oct 24 17:45:38 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=e17b0832 Embracing gnome_role_template within dbus_role_template call The gnome_role_template interface requires the dbus_role_template to be called and available. --- policy/modules/roles/staff.te | 8 ++++---- policy/modules/roles/sysadm.te | 8 ++++---- policy/modules/roles/unprivuser.te | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/policy/modules/roles/staff.te b/policy/modules/roles/staff.te index 9d2498e..f0d3c66 100644 --- a/policy/modules/roles/staff.te +++ b/policy/modules/roles/staff.te @@ -82,6 +82,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(` @@ -97,10 +101,6 @@ ifndef(`distro_redhat',` ') optional_policy(` - gnome_role_template(staff, staff_r, staff_t) - ') - - optional_policy(` gorg_role(staff_r, staff_t) ') diff --git a/policy/modules/roles/sysadm.te b/policy/modules/roles/sysadm.te index cd49816..80e9aa1 100644 --- a/policy/modules/roles/sysadm.te +++ b/policy/modules/roles/sysadm.te @@ -501,6 +501,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(` @@ -516,10 +520,6 @@ ifndef(`distro_redhat',` ') optional_policy(` - gnome_role_template(sysadm, sysadm_r, sysadm_t) - ') - - optional_policy(` gorg_role(sysadm_r, sysadm_t) ') diff --git a/policy/modules/roles/unprivuser.te b/policy/modules/roles/unprivuser.te index c787c95..12b0b32 100644 --- a/policy/modules/roles/unprivuser.te +++ b/policy/modules/roles/unprivuser.te @@ -55,6 +55,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(` @@ -70,10 +74,6 @@ ifndef(`distro_redhat',` ') optional_policy(` - gnome_role_template(user, user_r, user_t) - ') - - optional_policy(` gorg_role(user_r, user_t) ')