From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 A16DD1382C5 for ; Sun, 22 Apr 2018 12:00:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 09F48E090F; Sun, 22 Apr 2018 12:00:49 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C58EDE090F for ; Sun, 22 Apr 2018 12:00:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9D8B0335C7F for ; Sun, 22 Apr 2018 12:00:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7946D29D for ; Sun, 22 Apr 2018 12:00:44 +0000 (UTC) From: "Jason Zaman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Zaman" Message-ID: <1524397983.1805a99f61ca86dea7465a06a5ac3d4ba2f40b36.perfinion@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/contrib/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: policy/modules/contrib/cups.if policy/modules/contrib/dspam.if policy/modules/contrib/samba.if X-VCS-Directories: policy/modules/contrib/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 1805a99f61ca86dea7465a06a5ac3d4ba2f40b36 X-VCS-Branch: master Date: Sun, 22 Apr 2018 12:00:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a098d0a7-f1d6-480c-bf7d-7759d6345c86 X-Archives-Hash: d8f95b232ce4fc90f96408ea7796585f commit: 1805a99f61ca86dea7465a06a5ac3d4ba2f40b36 Author: James Carter tycho nsa gov> AuthorDate: Wed Apr 11 18:56:55 2018 +0000 Commit: Jason Zaman gentoo org> CommitDate: Sun Apr 22 11:53:03 2018 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=1805a99f Remove undeclared identifiers from interfaces All the interfaces below were always being removed because of unmet requires. cups.if:cups_admin() Remove references to undeclared type cupsd_spool_t. Called in roles/sysadm.te dspam.if:dspam_stream_connect() Remove references to undeclared type dspam_tmp_t. Called in contrib/postfix.te samba.if:samba_admin() Remove references to undeclared type smbd_spool_t. Called in roles/sysadm.te Signed-off-by: James Carter tycho.nsa.gov> policy/modules/contrib/cups.if | 3 +-- policy/modules/contrib/dspam.if | 4 ++-- policy/modules/contrib/samba.if | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/policy/modules/contrib/cups.if b/policy/modules/contrib/cups.if index 73887e50..e268b96f 100644 --- a/policy/modules/contrib/cups.if +++ b/policy/modules/contrib/cups.if @@ -352,7 +352,7 @@ interface(`cups_domtrans_hplip',` interface(`cups_admin',` gen_require(` type cupsd_t, cupsd_tmp_t, cupsd_lpd_tmp_t; - type cupsd_etc_t, cupsd_log_t, cupsd_spool_t; + type cupsd_etc_t, cupsd_log_t; type cupsd_config_var_run_t, cupsd_lpd_var_run_t; type cupsd_var_run_t, ptal_etc_t, cupsd_rw_etc_t; type ptal_var_run_t, hplip_var_run_t, cupsd_initrc_exec_t; @@ -374,7 +374,6 @@ interface(`cups_admin',` admin_pattern($1, cupsd_log_t) files_list_spool($1) - admin_pattern($1, cupsd_spool_t) files_list_tmp($1) admin_pattern($1, { cupsd_tmp_t cupsd_lpd_tmp_t }) diff --git a/policy/modules/contrib/dspam.if b/policy/modules/contrib/dspam.if index a8cd028b..969fd89d 100644 --- a/policy/modules/contrib/dspam.if +++ b/policy/modules/contrib/dspam.if @@ -32,12 +32,12 @@ interface(`dspam_domtrans',` # interface(`dspam_stream_connect',` gen_require(` - type dspam_t, dspam_var_run_t, dspam_tmp_t; + type dspam_t, dspam_var_run_t; ') files_search_pids($1) files_search_tmp($1) - stream_connect_pattern($1, { dspam_tmp_t dspam_var_run_t }, { dspam_tmp_t dspam_var_run_t }, dspam_t) + stream_connect_pattern($1, dspam_var_run_t, dspam_var_run_t, dspam_t) ') ######################################## diff --git a/policy/modules/contrib/samba.if b/policy/modules/contrib/samba.if index f863af8f..3d729f0c 100644 --- a/policy/modules/contrib/samba.if +++ b/policy/modules/contrib/samba.if @@ -684,7 +684,7 @@ interface(`samba_stream_connect_winbind',` interface(`samba_admin',` gen_require(` type nmbd_t, nmbd_var_run_t, smbd_var_run_t; - type smbd_t, smbd_tmp_t, smbd_spool_t; + type smbd_t, smbd_tmp_t; type samba_log_t, samba_var_t, samba_secrets_t; type samba_etc_t, samba_share_t, samba_initrc_exec_t; type swat_var_run_t, swat_tmp_t, winbind_log_t; @@ -707,7 +707,6 @@ interface(`samba_admin',` admin_pattern($1, { samba_share_t samba_var_t samba_secrets_t }) files_list_spool($1) - admin_pattern($1, smbd_spool_t) files_list_pids($1) admin_pattern($1, { winbind_var_run_t smbd_var_run_t swat_var_run_t nmbd_var_run_t })