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 A724A1395E2 for ; Tue, 6 Dec 2016 14:25:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AE53021C205; Tue, 6 Dec 2016 14:25:13 +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 8D37121C205 for ; Tue, 6 Dec 2016 14:25:08 +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 C0A4E341586 for ; Tue, 6 Dec 2016 14:25:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7CE1824C5 for ; Tue, 6 Dec 2016 14:25:00 +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: <1481030380.b822b1181b81fd74038c8987162a1cfe86611720.perfinion@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:next commit in: policy/modules/contrib/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: policy/modules/contrib/cups.if X-VCS-Directories: policy/modules/contrib/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: b822b1181b81fd74038c8987162a1cfe86611720 X-VCS-Branch: next Date: Tue, 6 Dec 2016 14:25:00 +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: 620a00ab-5cff-4f71-865d-2ad857c3d5c7 X-Archives-Hash: 71729e15362d07723fea8852a5a7e1d2 Message-ID: <20161206142500.IKSYcz39n9HJ2eJSEZQg1yWGOHPVJVZBFanuvX7MuP8@z> commit: b822b1181b81fd74038c8987162a1cfe86611720 Author: Guido Trentalancia trentalancia net> AuthorDate: Fri Nov 25 22:14:47 2016 +0000 Commit: Jason Zaman gentoo org> CommitDate: Tue Dec 6 13:19:40 2016 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=b822b118 cups: descend "rw" directories when reading configuration files When reading CUPS configuration files under /etc, let the caller search (i.e. descend into) "rw" directories (such as "ppd"). Signed-off-by: Guido Trentalancia trentalancia.net> policy/modules/contrib/cups.if | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/policy/modules/contrib/cups.if b/policy/modules/contrib/cups.if index cad7df2..a6bcb68 100644 --- a/policy/modules/contrib/cups.if +++ b/policy/modules/contrib/cups.if @@ -203,7 +203,7 @@ interface(`cups_read_config',` ') files_search_etc($1) - read_files_pattern($1, cupsd_etc_t, { cupsd_etc_t cupsd_rw_etc_t }) + read_files_pattern($1, { cupsd_etc_t cupsd_rw_etc_t }, { cupsd_etc_t cupsd_rw_etc_t }) ') ######################################## @@ -223,7 +223,7 @@ interface(`cups_read_rw_config',` ') files_search_etc($1) - read_files_pattern($1, cupsd_etc_t, cupsd_rw_etc_t) + read_files_pattern($1, { cupsd_etc_t cupsd_rw_etc_t }, cupsd_rw_etc_t) ') ########################################