[refpolicy] [oident patch 1/1] Access for confined users to oidentd user home content is unconditional.

[refpolicy] [oident patch 1/1] Access for confined users to oidentd user home content is unconditional.

[Dominick Grift]

Signed-off-by: Dominick Grift <domg472@gmail.com>
---
:100644 100644 0c9876c... 3fed14e... M	policy/modules/roles/staff.te
:100644 100644 e8a507d... 93b9f7f... M	policy/modules/roles/unprivuser.te
 policy/modules/roles/staff.te      |    9 +++++----
 policy/modules/roles/unprivuser.te |   10 +++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/policy/modules/roles/staff.te b/policy/modules/roles/staff.te
index 0c9876c..3fed14e 100644
--- a/policy/modules/roles/staff.te
+++ b/policy/modules/roles/staff.te
@@ -27,6 +27,11 @@ optional_policy(`
 ')
 
 optional_policy(`
+	oident_manage_user_content(staff_t)
+	oident_relabel_user_content(staff_t)
+')
+
+optional_policy(`
 	postgresql_role(staff_r, staff_t)
 ')
 
@@ -121,10 +126,6 @@ ifndef(`distro_redhat',`
 	')
 
 	optional_policy(`
-		oident_manage_user_content(staff_t)
-		oident_relabel_user_content(staff_t)
-	')
-	optional_policy(`
 		pyzor_role(staff_r, staff_t)
 	')
 
diff --git a/policy/modules/roles/unprivuser.te b/policy/modules/roles/unprivuser.te
index e8a507d..93b9f7f 100644
--- a/policy/modules/roles/unprivuser.te
+++ b/policy/modules/roles/unprivuser.te
@@ -17,6 +17,11 @@ optional_policy(`
 ')
 
 optional_policy(`
+	oident_manage_user_content(user_t)
+	oident_relabel_user_content(user_t)
+')
+
+optional_policy(`
 	screen_role_template(user, user_r, user_t)
 ')
 
@@ -94,11 +99,6 @@ ifndef(`distro_redhat',`
 	')
 
 	optional_policy(`
-		oident_manage_user_content(user_t)
-		oident_relabel_user_content(user_t)
-	')
-
-	optional_policy(`
 		postgresql_role(user_r, user_t)
 	')
 
-- 
1.7.2.1

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
Url : http://oss.tresys.com/pipermail/refpolicy/attachments/20100910/a95d59c8/attachment-0001.bin 

[refpolicy] [oident patch 1/1] Access for confined users to oidentd user home content is unconditional.

[Christopher J. PeBenito]

On 09/10/10 12:21, Dominick Grift wrote:
> Signed-off-by: Dominick Grift<domg472@gmail.com>

Merged.

> ---
> :100644 100644 0c9876c... 3fed14e... M	policy/modules/roles/staff.te
> :100644 100644 e8a507d... 93b9f7f... M	policy/modules/roles/unprivuser.te
>   policy/modules/roles/staff.te      |    9 +++++----
>   policy/modules/roles/unprivuser.te |   10 +++++-----
>   2 files changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/policy/modules/roles/staff.te b/policy/modules/roles/staff.te
> index 0c9876c..3fed14e 100644
> --- a/policy/modules/roles/staff.te
> +++ b/policy/modules/roles/staff.te
> @@ -27,6 +27,11 @@ optional_policy(`
>   ')
>
>   optional_policy(`
> +	oident_manage_user_content(staff_t)
> +	oident_relabel_user_content(staff_t)
> +')
> +
> +optional_policy(`
>   	postgresql_role(staff_r, staff_t)
>   ')
>
> @@ -121,10 +126,6 @@ ifndef(`distro_redhat',`
>   	')
>
>   	optional_policy(`
> -		oident_manage_user_content(staff_t)
> -		oident_relabel_user_content(staff_t)
> -	')
> -	optional_policy(`
>   		pyzor_role(staff_r, staff_t)
>   	')
>
> diff --git a/policy/modules/roles/unprivuser.te b/policy/modules/roles/unprivuser.te
> index e8a507d..93b9f7f 100644
> --- a/policy/modules/roles/unprivuser.te
> +++ b/policy/modules/roles/unprivuser.te
> @@ -17,6 +17,11 @@ optional_policy(`
>   ')
>
>   optional_policy(`
> +	oident_manage_user_content(user_t)
> +	oident_relabel_user_content(user_t)
> +')
> +
> +optional_policy(`
>   	screen_role_template(user, user_r, user_t)
>   ')
>
> @@ -94,11 +99,6 @@ ifndef(`distro_redhat',`
>   	')
>
>   	optional_policy(`
> -		oident_manage_user_content(user_t)
> -		oident_relabel_user_content(user_t)
> -	')
> -
> -	optional_policy(`
>   		postgresql_role(user_r, user_t)
>   	')
>
>
>
>
> _______________________________________________
> refpolicy mailing list
> refpolicy at oss.tresys.com
> http://oss.tresys.com/mailman/listinfo/refpolicy


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