From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-907947-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 41479138CD6 for <garchives@archives.gentoo.org>; Mon, 24 Oct 2016 16:57:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 10FCCE0B07; Mon, 24 Oct 2016 16:56:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DED9DE0B07 for <gentoo-commits@lists.gentoo.org>; Mon, 24 Oct 2016 16:56:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 930803415A2 for <gentoo-commits@lists.gentoo.org>; Mon, 24 Oct 2016 16:56:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 611F82413 for <gentoo-commits@lists.gentoo.org>; Mon, 24 Oct 2016 16:56:34 +0000 (UTC) From: "Sven Vermeulen" <swift@gentoo.org> 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" <swift@gentoo.org> Message-ID: <1477327287.7802f6b2a69eefd11feb78859d2feb58be59a99b.swift@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/system/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: policy/modules/system/miscfiles.fc policy/modules/system/miscfiles.if policy/modules/system/miscfiles.te policy/modules/system/userdomain.if policy/modules/system/userdomain.te X-VCS-Directories: policy/modules/system/ X-VCS-Committer: swift X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: 7802f6b2a69eefd11feb78859d2feb58be59a99b X-VCS-Branch: master Date: Mon, 24 Oct 2016 16:56:34 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f67c81b5-93af-4546-a7e3-67f35d8dd18f X-Archives-Hash: 48ded698f94c54e079fd6a4fc599019a commit: 7802f6b2a69eefd11feb78859d2feb58be59a99b Author: Sven Vermeulen <swift <AT> gentoo <DOT> org> AuthorDate: Mon Oct 24 16:41:27 2016 +0000 Commit: Sven Vermeulen <swift <AT> gentoo <DOT> org> CommitDate: Mon Oct 24 16:41:27 2016 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=7802f6b2 Switch from cert_home_t to user_cert_t The type for user home certificate directories (and files) is user_cert_t. Remove all references to its code, and instead use the new type. Keep an alias at hand for third party SELinux policy modules though. policy/modules/system/miscfiles.fc | 2 -- policy/modules/system/miscfiles.if | 40 ++----------------------------------- policy/modules/system/miscfiles.te | 7 ------- policy/modules/system/userdomain.if | 2 -- policy/modules/system/userdomain.te | 7 +++++++ 5 files changed, 9 insertions(+), 49 deletions(-) diff --git a/policy/modules/system/miscfiles.fc b/policy/modules/system/miscfiles.fc index be0b6a1..42ac30b 100644 --- a/policy/modules/system/miscfiles.fc +++ b/policy/modules/system/miscfiles.fc @@ -103,8 +103,6 @@ ifdef(`distro_redhat',` /var/spool/postfix/etc/localtime -- gen_context(system_u:object_r:locale_t,s0) ') -HOME_DIR/.pki(/.*)? gen_context(system_u:object_r:cert_home_t,s0) - ifdef(`distro_gentoo',` /etc/fonts(/.*)? gen_context(system_u:object_r:fonts_t,s0) ') diff --git a/policy/modules/system/miscfiles.if b/policy/modules/system/miscfiles.if index 63ed47f..93e6acb 100644 --- a/policy/modules/system/miscfiles.if +++ b/policy/modules/system/miscfiles.if @@ -97,15 +97,8 @@ interface(`miscfiles_read_generic_certs',` ## </param> # interface(`miscfiles_manage_user_certs',` - gen_require(` - type cert_home_t; - ') - - manage_dirs_pattern($1, cert_home_t, cert_home_t) - manage_files_pattern($1, cert_home_t, cert_home_t) - manage_lnk_files_pattern($1, cert_home_t, cert_home_t) - - userdom_search_user_home_dirs($1) + userdom_manage_user_certs($1) + refpolicywarn(`$0() has been deprecated, please use userdom_manage_user_certs() instead.') ') ######################################## @@ -213,35 +206,6 @@ interface(`miscfiles_manage_cert_files',` ######################################## ## <summary> -## Automatically use the cert_home_t label for selected resources created -## in a users home directory -## </summary> -## <param name="domain"> -## <summary> -## Domain allowed access -## </summary> -## </param> -## <param name="class"> -## <summary> -## Resource type(s) for which the label should be used -## </summary> -## </param> -## <param name="filename" optional="true"> -## <summary> -## Name of the resource that is being created -## </summary> -## </param> -# -interface(`miscfiles_user_home_dir_filetrans_cert_home',` - gen_require(` - type cert_home_t; - ') - - userdom_user_home_dir_filetrans($1, cert_home_t, $2, $3) -') - -######################################## -## <summary> ## Read fonts. ## </summary> ## <param name="domain"> diff --git a/policy/modules/system/miscfiles.te b/policy/modules/system/miscfiles.te index 246ac6a..85a29e3 100644 --- a/policy/modules/system/miscfiles.te +++ b/policy/modules/system/miscfiles.te @@ -14,13 +14,6 @@ type cert_t; miscfiles_cert_type(cert_t) # -# cert_home_t is the type of files in the users' home directories. -# -type cert_home_t; -miscfiles_cert_type(cert_home_t) -userdom_user_home_content(cert_home_t) - -# # fonts_t is the type of various font # files in /usr # diff --git a/policy/modules/system/userdomain.if b/policy/modules/system/userdomain.if index 7c0d914..879ab82 100644 --- a/policy/modules/system/userdomain.if +++ b/policy/modules/system/userdomain.if @@ -272,8 +272,6 @@ interface(`userdom_manage_home_role',` ') ifdef(`distro_gentoo',` - miscfiles_manage_user_certs($2) - miscfiles_relabel_user_certs($2) optional_policy(` flash_manage_home($2) diff --git a/policy/modules/system/userdomain.te b/policy/modules/system/userdomain.te index 0b0eb60..94b068e 100644 --- a/policy/modules/system/userdomain.te +++ b/policy/modules/system/userdomain.te @@ -128,3 +128,10 @@ files_poly(user_runtime_t) files_poly_member(user_runtime_t) files_poly_parent(user_runtime_t) ubac_constrained(user_runtime_t) + +ifdef(`distro_gentoo',` + # We used to use cert_home_t but an upstream commit introduced the same + # concept as user_cert_t. Enabling an alias to keep custom modules from + # users running. + type user_cert_t alias cert_home_t; +') From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-907952-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0326E138D1A for <garchives@archives.gentoo.org>; Mon, 24 Oct 2016 17:14:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F3B54E0925; Mon, 24 Oct 2016 17:14:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CBB02E0913 for <gentoo-commits@lists.gentoo.org>; Mon, 24 Oct 2016 17:14:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 311223412F9 for <gentoo-commits@lists.gentoo.org>; Mon, 24 Oct 2016 17:14:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A59EA249D for <gentoo-commits@lists.gentoo.org>; Mon, 24 Oct 2016 17:13:59 +0000 (UTC) From: "Sven Vermeulen" <swift@gentoo.org> 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" <swift@gentoo.org> Message-ID: <1477327287.7802f6b2a69eefd11feb78859d2feb58be59a99b.swift@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:next commit in: policy/modules/system/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: policy/modules/system/miscfiles.fc policy/modules/system/miscfiles.if policy/modules/system/miscfiles.te policy/modules/system/userdomain.if policy/modules/system/userdomain.te X-VCS-Directories: policy/modules/system/ X-VCS-Committer: swift X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: 7802f6b2a69eefd11feb78859d2feb58be59a99b X-VCS-Branch: next Date: Mon, 24 Oct 2016 17:13:59 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 27c098fa-7e51-4549-b92e-de5e6ddfa052 X-Archives-Hash: 3841e458bf7b7eb876f996a94f6af0ee Message-ID: <20161024171359.XiJF1oCX-bwv93bFvi2NaSyz5xdvX5IIMDuUqVai5Zg@z> commit: 7802f6b2a69eefd11feb78859d2feb58be59a99b Author: Sven Vermeulen <swift <AT> gentoo <DOT> org> AuthorDate: Mon Oct 24 16:41:27 2016 +0000 Commit: Sven Vermeulen <swift <AT> gentoo <DOT> org> CommitDate: Mon Oct 24 16:41:27 2016 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=7802f6b2 Switch from cert_home_t to user_cert_t The type for user home certificate directories (and files) is user_cert_t. Remove all references to its code, and instead use the new type. Keep an alias at hand for third party SELinux policy modules though. policy/modules/system/miscfiles.fc | 2 -- policy/modules/system/miscfiles.if | 40 ++----------------------------------- policy/modules/system/miscfiles.te | 7 ------- policy/modules/system/userdomain.if | 2 -- policy/modules/system/userdomain.te | 7 +++++++ 5 files changed, 9 insertions(+), 49 deletions(-) diff --git a/policy/modules/system/miscfiles.fc b/policy/modules/system/miscfiles.fc index be0b6a1..42ac30b 100644 --- a/policy/modules/system/miscfiles.fc +++ b/policy/modules/system/miscfiles.fc @@ -103,8 +103,6 @@ ifdef(`distro_redhat',` /var/spool/postfix/etc/localtime -- gen_context(system_u:object_r:locale_t,s0) ') -HOME_DIR/.pki(/.*)? gen_context(system_u:object_r:cert_home_t,s0) - ifdef(`distro_gentoo',` /etc/fonts(/.*)? gen_context(system_u:object_r:fonts_t,s0) ') diff --git a/policy/modules/system/miscfiles.if b/policy/modules/system/miscfiles.if index 63ed47f..93e6acb 100644 --- a/policy/modules/system/miscfiles.if +++ b/policy/modules/system/miscfiles.if @@ -97,15 +97,8 @@ interface(`miscfiles_read_generic_certs',` ## </param> # interface(`miscfiles_manage_user_certs',` - gen_require(` - type cert_home_t; - ') - - manage_dirs_pattern($1, cert_home_t, cert_home_t) - manage_files_pattern($1, cert_home_t, cert_home_t) - manage_lnk_files_pattern($1, cert_home_t, cert_home_t) - - userdom_search_user_home_dirs($1) + userdom_manage_user_certs($1) + refpolicywarn(`$0() has been deprecated, please use userdom_manage_user_certs() instead.') ') ######################################## @@ -213,35 +206,6 @@ interface(`miscfiles_manage_cert_files',` ######################################## ## <summary> -## Automatically use the cert_home_t label for selected resources created -## in a users home directory -## </summary> -## <param name="domain"> -## <summary> -## Domain allowed access -## </summary> -## </param> -## <param name="class"> -## <summary> -## Resource type(s) for which the label should be used -## </summary> -## </param> -## <param name="filename" optional="true"> -## <summary> -## Name of the resource that is being created -## </summary> -## </param> -# -interface(`miscfiles_user_home_dir_filetrans_cert_home',` - gen_require(` - type cert_home_t; - ') - - userdom_user_home_dir_filetrans($1, cert_home_t, $2, $3) -') - -######################################## -## <summary> ## Read fonts. ## </summary> ## <param name="domain"> diff --git a/policy/modules/system/miscfiles.te b/policy/modules/system/miscfiles.te index 246ac6a..85a29e3 100644 --- a/policy/modules/system/miscfiles.te +++ b/policy/modules/system/miscfiles.te @@ -14,13 +14,6 @@ type cert_t; miscfiles_cert_type(cert_t) # -# cert_home_t is the type of files in the users' home directories. -# -type cert_home_t; -miscfiles_cert_type(cert_home_t) -userdom_user_home_content(cert_home_t) - -# # fonts_t is the type of various font # files in /usr # diff --git a/policy/modules/system/userdomain.if b/policy/modules/system/userdomain.if index 7c0d914..879ab82 100644 --- a/policy/modules/system/userdomain.if +++ b/policy/modules/system/userdomain.if @@ -272,8 +272,6 @@ interface(`userdom_manage_home_role',` ') ifdef(`distro_gentoo',` - miscfiles_manage_user_certs($2) - miscfiles_relabel_user_certs($2) optional_policy(` flash_manage_home($2) diff --git a/policy/modules/system/userdomain.te b/policy/modules/system/userdomain.te index 0b0eb60..94b068e 100644 --- a/policy/modules/system/userdomain.te +++ b/policy/modules/system/userdomain.te @@ -128,3 +128,10 @@ files_poly(user_runtime_t) files_poly_member(user_runtime_t) files_poly_parent(user_runtime_t) ubac_constrained(user_runtime_t) + +ifdef(`distro_gentoo',` + # We used to use cert_home_t but an upstream commit introduced the same + # concept as user_cert_t. Enabling an alias to keep custom modules from + # users running. + type user_cert_t alias cert_home_t; +') From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-907937-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6D42E138CD4 for <garchives@archives.gentoo.org>; Mon, 24 Oct 2016 16:47:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 623DFE094C; Mon, 24 Oct 2016 16:47:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 197D3E094C for <gentoo-commits@lists.gentoo.org>; Mon, 24 Oct 2016 16:47:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ECCC6341665 for <gentoo-commits@lists.gentoo.org>; Mon, 24 Oct 2016 16:47:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5B70E2413 for <gentoo-commits@lists.gentoo.org>; Mon, 24 Oct 2016 16:47:54 +0000 (UTC) From: "Sven Vermeulen" <swift@gentoo.org> 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" <swift@gentoo.org> Message-ID: <1477327287.7802f6b2a69eefd11feb78859d2feb58be59a99b.swift@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:swift commit in: policy/modules/system/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: policy/modules/system/miscfiles.fc policy/modules/system/miscfiles.if policy/modules/system/miscfiles.te policy/modules/system/userdomain.if policy/modules/system/userdomain.te X-VCS-Directories: policy/modules/system/ X-VCS-Committer: swift X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: 7802f6b2a69eefd11feb78859d2feb58be59a99b X-VCS-Branch: swift Date: Mon, 24 Oct 2016 16:47:54 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0c16b722-4209-4610-a583-3bb3bbfd9435 X-Archives-Hash: fe5a254293b4b744d5c6113665c4fa2e Message-ID: <20161024164754.wI_AOiBijn2t4Aao6ufsrkpVZ9pED0epm9F_W9-n7UE@z> commit: 7802f6b2a69eefd11feb78859d2feb58be59a99b Author: Sven Vermeulen <swift <AT> gentoo <DOT> org> AuthorDate: Mon Oct 24 16:41:27 2016 +0000 Commit: Sven Vermeulen <swift <AT> gentoo <DOT> org> CommitDate: Mon Oct 24 16:41:27 2016 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=7802f6b2 Switch from cert_home_t to user_cert_t The type for user home certificate directories (and files) is user_cert_t. Remove all references to its code, and instead use the new type. Keep an alias at hand for third party SELinux policy modules though. policy/modules/system/miscfiles.fc | 2 -- policy/modules/system/miscfiles.if | 40 ++----------------------------------- policy/modules/system/miscfiles.te | 7 ------- policy/modules/system/userdomain.if | 2 -- policy/modules/system/userdomain.te | 7 +++++++ 5 files changed, 9 insertions(+), 49 deletions(-) diff --git a/policy/modules/system/miscfiles.fc b/policy/modules/system/miscfiles.fc index be0b6a1..42ac30b 100644 --- a/policy/modules/system/miscfiles.fc +++ b/policy/modules/system/miscfiles.fc @@ -103,8 +103,6 @@ ifdef(`distro_redhat',` /var/spool/postfix/etc/localtime -- gen_context(system_u:object_r:locale_t,s0) ') -HOME_DIR/.pki(/.*)? gen_context(system_u:object_r:cert_home_t,s0) - ifdef(`distro_gentoo',` /etc/fonts(/.*)? gen_context(system_u:object_r:fonts_t,s0) ') diff --git a/policy/modules/system/miscfiles.if b/policy/modules/system/miscfiles.if index 63ed47f..93e6acb 100644 --- a/policy/modules/system/miscfiles.if +++ b/policy/modules/system/miscfiles.if @@ -97,15 +97,8 @@ interface(`miscfiles_read_generic_certs',` ## </param> # interface(`miscfiles_manage_user_certs',` - gen_require(` - type cert_home_t; - ') - - manage_dirs_pattern($1, cert_home_t, cert_home_t) - manage_files_pattern($1, cert_home_t, cert_home_t) - manage_lnk_files_pattern($1, cert_home_t, cert_home_t) - - userdom_search_user_home_dirs($1) + userdom_manage_user_certs($1) + refpolicywarn(`$0() has been deprecated, please use userdom_manage_user_certs() instead.') ') ######################################## @@ -213,35 +206,6 @@ interface(`miscfiles_manage_cert_files',` ######################################## ## <summary> -## Automatically use the cert_home_t label for selected resources created -## in a users home directory -## </summary> -## <param name="domain"> -## <summary> -## Domain allowed access -## </summary> -## </param> -## <param name="class"> -## <summary> -## Resource type(s) for which the label should be used -## </summary> -## </param> -## <param name="filename" optional="true"> -## <summary> -## Name of the resource that is being created -## </summary> -## </param> -# -interface(`miscfiles_user_home_dir_filetrans_cert_home',` - gen_require(` - type cert_home_t; - ') - - userdom_user_home_dir_filetrans($1, cert_home_t, $2, $3) -') - -######################################## -## <summary> ## Read fonts. ## </summary> ## <param name="domain"> diff --git a/policy/modules/system/miscfiles.te b/policy/modules/system/miscfiles.te index 246ac6a..85a29e3 100644 --- a/policy/modules/system/miscfiles.te +++ b/policy/modules/system/miscfiles.te @@ -14,13 +14,6 @@ type cert_t; miscfiles_cert_type(cert_t) # -# cert_home_t is the type of files in the users' home directories. -# -type cert_home_t; -miscfiles_cert_type(cert_home_t) -userdom_user_home_content(cert_home_t) - -# # fonts_t is the type of various font # files in /usr # diff --git a/policy/modules/system/userdomain.if b/policy/modules/system/userdomain.if index 7c0d914..879ab82 100644 --- a/policy/modules/system/userdomain.if +++ b/policy/modules/system/userdomain.if @@ -272,8 +272,6 @@ interface(`userdom_manage_home_role',` ') ifdef(`distro_gentoo',` - miscfiles_manage_user_certs($2) - miscfiles_relabel_user_certs($2) optional_policy(` flash_manage_home($2) diff --git a/policy/modules/system/userdomain.te b/policy/modules/system/userdomain.te index 0b0eb60..94b068e 100644 --- a/policy/modules/system/userdomain.te +++ b/policy/modules/system/userdomain.te @@ -128,3 +128,10 @@ files_poly(user_runtime_t) files_poly_member(user_runtime_t) files_poly_parent(user_runtime_t) ubac_constrained(user_runtime_t) + +ifdef(`distro_gentoo',` + # We used to use cert_home_t but an upstream commit introduced the same + # concept as user_cert_t. Enabling an alias to keep custom modules from + # users running. + type user_cert_t alias cert_home_t; +')