Changes to the user domain policy module

PATCH Superseded Dominick Grift 2 participants 3 messages Oct 22, 2012 – Oct 30, 2012

lore

Share & tools

lore

Dominick Grift

author

2012-10-22 12:48 UTC #0 lore raw

PATCH v2 1/1 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 <[email protected]>

policy/modules/roles/staff.te +4 -4

index e5aee97..3e7b9ac 100644
@@ -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(`

policy/modules/roles/sysadm.te +4 -4

index 44c198a..1deb197 100644
@@ -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(`

policy/modules/roles/unprivuser.te +4 -4

index 9f6d4c3..2d63b22 100644
@@ -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(`

policy/modules/system/userdomain.if +4 -0

index 275bd2b..b487e99 100644
@@ -911,6 +911,10 @@
 		')
 
 		optional_policy(`
+			gnome_role_template($1, $1_r, $1_t)
+		')
+
+		optional_policy(`
 			wm_role_template($1, $1_r, $1_t)
 		')
 	')

Dominick Grift

author

2012-10-30 19:25 UTC #1 lore raw

PATCH v2 1/1 Changes to the user domain policy module

I did like you wanted it. Can this be merged as well now?

Quoted 97 lines · Dominick Grift

gnome_role is deprecated, use gnome_role_template instead depends on dbus because of gkeyringd

Signed-off-by Dominick Grift <[email protected]>

policy/modules/roles/staff.te +4 -4

index e5aee97..3e7b9ac 100644
@@ -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(`

policy/modules/roles/sysadm.te +4 -4

index 44c198a..1deb197 100644
@@ -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(`

policy/modules/roles/unprivuser.te +4 -4

index 9f6d4c3..2d63b22 100644
@@ -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(`

policy/modules/system/userdomain.if +4 -0

index 275bd2b..b487e99 100644
@@ -911,6 +911,10 @@
 		')
 
 		optional_policy(`
+			gnome_role_template($1, $1_r, $1_t)
+		')
+
+		optional_policy(`
 			wm_role_template($1, $1_r, $1_t)
 		')
 	')

Christopher J. PeBenito

2012-10-30 20:00 UTC #2 lore raw

PATCH v2 1/1 Changes to the user domain policy module

In reply to Dominick Grift

Quoted 3 lines · Dominick Grift

gnome_role is deprecated, use gnome_role_template instead depends on dbus because of gkeyringd

Merged.

Quoted 94 lines

Signed-off-by Dominick Grift <[email protected]>

policy/modules/roles/staff.te +4 -4

index e5aee97..3e7b9ac 100644
@@ -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(`

policy/modules/roles/sysadm.te +4 -4

index 44c198a..1deb197 100644
@@ -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(`

policy/modules/roles/unprivuser.te +4 -4

index 9f6d4c3..2d63b22 100644
@@ -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(`

policy/modules/system/userdomain.if +4 -0

index 275bd2b..b487e99 100644
@@ -911,6 +911,10 @@
 		')
 
 		optional_policy(`
+			gnome_role_template($1, $1_r, $1_t)
+		')
+
+		optional_policy(`
 			wm_role_template($1, $1_r, $1_t)
 		')
 	')

Signature · 3 lines

Chris PeBenito
Tresys Technology, LLC
www.tresys.com | oss.tresys.com