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 38AE51382C5 for ; Mon, 1 Feb 2021 02:10:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BA85DE09B0; Mon, 1 Feb 2021 02:10:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 A206CE09B0 for ; Mon, 1 Feb 2021 02:10:12 +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 B7CB4340F15 for ; Mon, 1 Feb 2021 02:10:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F009D4B6 for ; Mon, 1 Feb 2021 02:10:08 +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: <1612142502.f9897d936fcad0c175a4a54dc9e14561fef9236d.perfinion@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/sysnetwork.te X-VCS-Directories: policy/modules/system/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: f9897d936fcad0c175a4a54dc9e14561fef9236d X-VCS-Branch: master Date: Mon, 1 Feb 2021 02:10:08 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 714ac562-9e5f-4b8e-ad9f-e14b953d4ef5 X-Archives-Hash: 92bec6e9450a8e5d324cbec2ffdf694b commit: f9897d936fcad0c175a4a54dc9e14561fef9236d Author: Chris PeBenito ieee org> AuthorDate: Thu Jan 28 16:30:40 2021 +0000 Commit: Jason Zaman gentoo org> CommitDate: Mon Feb 1 01:21:42 2021 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=f9897d93 sysnetwork: Merge dhcpc_manage_samba tunable block with existing samba block. This moves the existing samba_manage_config(dhcpc_t) that is not tunable into the tunable block. Signed-off-by: Chris PeBenito ieee.org> Signed-off-by: Jason Zaman gentoo.org> policy/modules/system/sysnetwork.te | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/policy/modules/system/sysnetwork.te b/policy/modules/system/sysnetwork.te index a8fe42d6..ee768012 100644 --- a/policy/modules/system/sysnetwork.te +++ b/policy/modules/system/sysnetwork.te @@ -184,18 +184,6 @@ ifdef(`init_systemd',` init_search_units(dhcpc_t) ') -optional_policy(` - tunable_policy(`dhcpc_manage_samba',` - samba_manage_var_files(dhcpc_t) - init_exec_script_files(dhcpc_t) - init_get_system_status(dhcpc_t) - samba_stop(dhcpc_t) - samba_start(dhcpc_t) - samba_reload(dhcpc_t) - samba_status(dhcpc_t) - ') -') - optional_policy(` avahi_domtrans(dhcpc_t) ') @@ -252,7 +240,16 @@ optional_policy(` ') optional_policy(` - samba_manage_config(dhcpc_t) + tunable_policy(`dhcpc_manage_samba',` + samba_manage_config(dhcpc_t) + samba_manage_var_files(dhcpc_t) + init_exec_script_files(dhcpc_t) + init_get_system_status(dhcpc_t) + samba_stop(dhcpc_t) + samba_start(dhcpc_t) + samba_reload(dhcpc_t) + samba_status(dhcpc_t) + ') ') optional_policy(`