* [refpolicy] [PATCH v2] Changes to the user domain policy module
@ 2012-10-22 12:48 Dominick Grift
2012-10-30 19:25 ` Dominick Grift
2012-10-30 20:00 ` Christopher J. PeBenito
0 siblings, 2 replies; 3+ messages in thread
From: Dominick Grift @ 2012-10-22 12:48 UTC (permalink / raw)
To: refpolicy
gnome_role is deprecated, use gnome_role_template instead
depends on dbus because of gkeyringd
Signed-off-by: Dominick Grift <dominick.grift@gmail.com>
diff --git a/policy/modules/roles/staff.te b/policy/modules/roles/staff.te
index e5aee97..3e7b9ac 100644
--- a/policy/modules/roles/staff.te
+++ b/policy/modules/roles/staff.te
@@ -78,6 +78,10 @@
optional_policy(`
dbus_role_template(staff, staff_r, staff_t)
+
+ optional_policy(`
+ gnome_role_template(staff, staff_r, staff_t)
+ ')
')
optional_policy(`
@@ -90,10 +94,6 @@
optional_policy(`
gift_role(staff_r, staff_t)
- ')
-
- optional_policy(`
- gnome_role(staff_r, staff_t)
')
optional_policy(`
diff --git a/policy/modules/roles/sysadm.te b/policy/modules/roles/sysadm.te
index 44c198a..1deb197 100644
--- a/policy/modules/roles/sysadm.te
+++ b/policy/modules/roles/sysadm.te
@@ -444,6 +444,10 @@
optional_policy(`
dbus_role_template(sysadm, sysadm_r, sysadm_t)
+
+ optional_policy(`
+ gnome_role_template(sysadm, sysadm_r, sysadm_t)
+ ')
')
optional_policy(`
@@ -456,10 +460,6 @@
optional_policy(`
gift_role(sysadm_r, sysadm_t)
- ')
-
- optional_policy(`
- gnome_role(sysadm_r, sysadm_t)
')
optional_policy(`
diff --git a/policy/modules/roles/unprivuser.te b/policy/modules/roles/unprivuser.te
index 9f6d4c3..2d63b22 100644
--- a/policy/modules/roles/unprivuser.te
+++ b/policy/modules/roles/unprivuser.te
@@ -51,6 +51,10 @@
optional_policy(`
dbus_role_template(user, user_r, user_t)
+
+ optional_policy(`
+ gnome_role_template(user, user_r, user_t)
+ ')
')
optional_policy(`
@@ -63,10 +67,6 @@
optional_policy(`
gift_role(user_r, user_t)
- ')
-
- optional_policy(`
- gnome_role(user_r, user_t)
')
optional_policy(`
diff --git a/policy/modules/system/userdomain.if b/policy/modules/system/userdomain.if
index 275bd2b..b487e99 100644
--- a/policy/modules/system/userdomain.if
+++ b/policy/modules/system/userdomain.if
@@ -911,6 +911,10 @@
')
optional_policy(`
+ gnome_role_template($1, $1_r, $1_t)
+ ')
+
+ optional_policy(`
wm_role_template($1, $1_r, $1_t)
')
')
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [refpolicy] [PATCH v2] Changes to the user domain policy module
2012-10-22 12:48 [refpolicy] [PATCH v2] Changes to the user domain policy module Dominick Grift
@ 2012-10-30 19:25 ` Dominick Grift
2012-10-30 20:00 ` Christopher J. PeBenito
1 sibling, 0 replies; 3+ messages in thread
From: Dominick Grift @ 2012-10-30 19:25 UTC (permalink / raw)
To: refpolicy
I did like you wanted it. Can this be merged as well now?
On Mon, 2012-10-22 at 14:48 +0200, Dominick Grift wrote:
> gnome_role is deprecated, use gnome_role_template instead
> depends on dbus because of gkeyringd
>
> Signed-off-by: Dominick Grift <dominick.grift@gmail.com>
> diff --git a/policy/modules/roles/staff.te b/policy/modules/roles/staff.te
> index e5aee97..3e7b9ac 100644
> --- a/policy/modules/roles/staff.te
> +++ b/policy/modules/roles/staff.te
> @@ -78,6 +78,10 @@
>
> optional_policy(`
> dbus_role_template(staff, staff_r, staff_t)
> +
> + optional_policy(`
> + gnome_role_template(staff, staff_r, staff_t)
> + ')
> ')
>
> optional_policy(`
> @@ -90,10 +94,6 @@
>
> optional_policy(`
> gift_role(staff_r, staff_t)
> - ')
> -
> - optional_policy(`
> - gnome_role(staff_r, staff_t)
> ')
>
> optional_policy(`
> diff --git a/policy/modules/roles/sysadm.te b/policy/modules/roles/sysadm.te
> index 44c198a..1deb197 100644
> --- a/policy/modules/roles/sysadm.te
> +++ b/policy/modules/roles/sysadm.te
> @@ -444,6 +444,10 @@
>
> optional_policy(`
> dbus_role_template(sysadm, sysadm_r, sysadm_t)
> +
> + optional_policy(`
> + gnome_role_template(sysadm, sysadm_r, sysadm_t)
> + ')
> ')
>
> optional_policy(`
> @@ -456,10 +460,6 @@
>
> optional_policy(`
> gift_role(sysadm_r, sysadm_t)
> - ')
> -
> - optional_policy(`
> - gnome_role(sysadm_r, sysadm_t)
> ')
>
> optional_policy(`
> diff --git a/policy/modules/roles/unprivuser.te b/policy/modules/roles/unprivuser.te
> index 9f6d4c3..2d63b22 100644
> --- a/policy/modules/roles/unprivuser.te
> +++ b/policy/modules/roles/unprivuser.te
> @@ -51,6 +51,10 @@
>
> optional_policy(`
> dbus_role_template(user, user_r, user_t)
> +
> + optional_policy(`
> + gnome_role_template(user, user_r, user_t)
> + ')
> ')
>
> optional_policy(`
> @@ -63,10 +67,6 @@
>
> optional_policy(`
> gift_role(user_r, user_t)
> - ')
> -
> - optional_policy(`
> - gnome_role(user_r, user_t)
> ')
>
> optional_policy(`
> diff --git a/policy/modules/system/userdomain.if b/policy/modules/system/userdomain.if
> index 275bd2b..b487e99 100644
> --- a/policy/modules/system/userdomain.if
> +++ b/policy/modules/system/userdomain.if
> @@ -911,6 +911,10 @@
> ')
>
> optional_policy(`
> + gnome_role_template($1, $1_r, $1_t)
> + ')
> +
> + optional_policy(`
> wm_role_template($1, $1_r, $1_t)
> ')
> ')
^ permalink raw reply [flat|nested] 3+ messages in thread
* [refpolicy] [PATCH v2] Changes to the user domain policy module
2012-10-22 12:48 [refpolicy] [PATCH v2] Changes to the user domain policy module Dominick Grift
2012-10-30 19:25 ` Dominick Grift
@ 2012-10-30 20:00 ` Christopher J. PeBenito
1 sibling, 0 replies; 3+ messages in thread
From: Christopher J. PeBenito @ 2012-10-30 20:00 UTC (permalink / raw)
To: refpolicy
On 10/22/12 08:48, Dominick Grift wrote:
>
> gnome_role is deprecated, use gnome_role_template instead
> depends on dbus because of gkeyringd
Merged.
> Signed-off-by: Dominick Grift <dominick.grift@gmail.com>
> diff --git a/policy/modules/roles/staff.te b/policy/modules/roles/staff.te
> index e5aee97..3e7b9ac 100644
> --- a/policy/modules/roles/staff.te
> +++ b/policy/modules/roles/staff.te
> @@ -78,6 +78,10 @@
>
> optional_policy(`
> dbus_role_template(staff, staff_r, staff_t)
> +
> + optional_policy(`
> + gnome_role_template(staff, staff_r, staff_t)
> + ')
> ')
>
> optional_policy(`
> @@ -90,10 +94,6 @@
>
> optional_policy(`
> gift_role(staff_r, staff_t)
> - ')
> -
> - optional_policy(`
> - gnome_role(staff_r, staff_t)
> ')
>
> optional_policy(`
> diff --git a/policy/modules/roles/sysadm.te b/policy/modules/roles/sysadm.te
> index 44c198a..1deb197 100644
> --- a/policy/modules/roles/sysadm.te
> +++ b/policy/modules/roles/sysadm.te
> @@ -444,6 +444,10 @@
>
> optional_policy(`
> dbus_role_template(sysadm, sysadm_r, sysadm_t)
> +
> + optional_policy(`
> + gnome_role_template(sysadm, sysadm_r, sysadm_t)
> + ')
> ')
>
> optional_policy(`
> @@ -456,10 +460,6 @@
>
> optional_policy(`
> gift_role(sysadm_r, sysadm_t)
> - ')
> -
> - optional_policy(`
> - gnome_role(sysadm_r, sysadm_t)
> ')
>
> optional_policy(`
> diff --git a/policy/modules/roles/unprivuser.te b/policy/modules/roles/unprivuser.te
> index 9f6d4c3..2d63b22 100644
> --- a/policy/modules/roles/unprivuser.te
> +++ b/policy/modules/roles/unprivuser.te
> @@ -51,6 +51,10 @@
>
> optional_policy(`
> dbus_role_template(user, user_r, user_t)
> +
> + optional_policy(`
> + gnome_role_template(user, user_r, user_t)
> + ')
> ')
>
> optional_policy(`
> @@ -63,10 +67,6 @@
>
> optional_policy(`
> gift_role(user_r, user_t)
> - ')
> -
> - optional_policy(`
> - gnome_role(user_r, user_t)
> ')
>
> optional_policy(`
> diff --git a/policy/modules/system/userdomain.if b/policy/modules/system/userdomain.if
> index 275bd2b..b487e99 100644
> --- a/policy/modules/system/userdomain.if
> +++ b/policy/modules/system/userdomain.if
> @@ -911,6 +911,10 @@
> ')
>
> optional_policy(`
> + gnome_role_template($1, $1_r, $1_t)
> + ')
> +
> + optional_policy(`
> wm_role_template($1, $1_r, $1_t)
> ')
> ')
--
Chris PeBenito
Tresys Technology, LLC
www.tresys.com | oss.tresys.com
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-10-30 20:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-22 12:48 [refpolicy] [PATCH v2] Changes to the user domain policy module Dominick Grift
2012-10-30 19:25 ` Dominick Grift
2012-10-30 20:00 ` Christopher J. PeBenito
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.