Move oident manage and relabel home content interfaces to common user template.

Signed-off-by: Dominick Grift <domg472@gmail.com>
2010-09-22 17:32:39 +02:00 · 2010-09-22 17:32:39 +02:00 · 329138beba
parent db774a54a6
commit 329138beba
4 changed files with 5 additions and 15 deletions
--- a/policy/modules/roles/staff.te
+++ b/policy/modules/roles/staff.te
@ -26,11 +26,6 @@ optional_policy(`
 	dbadm_role_change(staff_r)
 ')

-optional_policy(`
-	oident_manage_user_content(staff_t)
-	oident_relabel_user_content(staff_t)
-')
-
 optional_policy(`
 	postgresql_role(staff_r, staff_t)
 ')
--- a/policy/modules/roles/sysadm.te
+++ b/policy/modules/roles/sysadm.te
@ -235,11 +235,6 @@ optional_policy(`
 	oav_run_update(sysadm_t, sysadm_r)
 ')

-optional_policy(`
-	oident_manage_user_content(sysadm_t)
-	oident_relabel_user_content(sysadm_t)
-')
-
 optional_policy(`
 	pcmcia_run_cardctl(sysadm_t, sysadm_r)
 ')
--- a/policy/modules/roles/unprivuser.te
+++ b/policy/modules/roles/unprivuser.te
@ -16,11 +16,6 @@ optional_policy(`
 	apache_role(user_r, user_t)
 ')

-optional_policy(`
-	oident_manage_user_content(user_t)
-	oident_relabel_user_content(user_t)
-')
-
 optional_policy(`
 	screen_role_template(user, user_r, user_t)
 ')
--- a/policy/modules/system/userdomain.if
+++ b/policy/modules/system/userdomain.if
@ -641,6 +641,11 @@ template(`userdom_common_user_template',`
 		')
 	')

+	optional_policy(`
+		oident_manage_user_content($1_t)
+		oident_relabel_user_content($1_t)
+	')
+
 	optional_policy(`
 		# to allow monitoring of pcmcia status
 		pcmcia_read_pid($1_t)