From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C1EDD138CD8 for ; Wed, 27 May 2015 20:00:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 724FAE0876; Wed, 27 May 2015 20:00:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 156D4E0876 for ; Wed, 27 May 2015 20:00:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5C276340E6B for ; Wed, 27 May 2015 20:00:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B546FA11 for ; Wed, 27 May 2015 20:00:43 +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: <1432753291.62f241df91ddddeee30ef0d5c18d498f8641f9f0.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/salt.if X-VCS-Directories: policy/modules/contrib/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 62f241df91ddddeee30ef0d5c18d498f8641f9f0 X-VCS-Branch: master Date: Wed, 27 May 2015 20:00:43 +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: 415cbb51-5982-4619-9e6e-ca4aa51e8cfb X-Archives-Hash: 553649c474f9df3a3fbaab1babaf4213 commit: 62f241df91ddddeee30ef0d5c18d498f8641f9f0 Author: Jason Zaman perfinion com> AuthorDate: Sun May 24 12:05:48 2015 +0000 Commit: Jason Zaman gentoo org> CommitDate: Wed May 27 19:01:31 2015 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=62f241df salt: use init_startstop_service interface in _admin The salt_admin interfaces had rules for RedHat sysvinit. This replaces them with the interface init_startstop_service which can easily be changed for other init systems. policy/modules/contrib/salt.if | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/policy/modules/contrib/salt.if b/policy/modules/contrib/salt.if index 7ab9e6b..27fefae 100644 --- a/policy/modules/contrib/salt.if +++ b/policy/modules/contrib/salt.if @@ -29,9 +29,7 @@ interface(`salt_admin_master',` allow $1 salt_master_t:process { ptrace signal_perms }; ps_process_pattern($1, salt_master_t) - init_labeled_script_domtrans($1, salt_master_initrc_exec_t) - domain_system_change_exemption($1) - role_transition $2 salt_master_initrc_exec_t system_r; + init_startstop_service($1, $2, salt_master_t, salt_master_initrc_exec_t) # for debugging? role_transition $2 salt_master_exec_t system_r; @@ -73,9 +71,7 @@ interface(`salt_admin_minion',` allow $1 salt_minion_t:process { ptrace signal_perms }; ps_process_pattern($1, salt_minion_t) - init_labeled_script_domtrans($1, salt_minion_initrc_exec_t) - domain_system_change_exemption($1) - role_transition $2 salt_minion_initrc_exec_t system_r; + init_startstop_service($1, $2, salt_minion_t, salt_minion_initrc_exec_t) # for debugging role_transition $2 salt_minion_exec_t system_r;