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 B5C97138CD0 for ; Fri, 22 May 2015 20:09:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A56DBE0891; Fri, 22 May 2015 20:09:41 +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 598F3E0891 for ; Fri, 22 May 2015 20:09:41 +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 21F88340A8E for ; Fri, 22 May 2015 20:09:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3A8B69BD for ; Fri, 22 May 2015 20:09:38 +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: <1432324327.4145312546b2dfef571c04698fa81b545a5be63d.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/init.if X-VCS-Directories: policy/modules/system/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 4145312546b2dfef571c04698fa81b545a5be63d X-VCS-Branch: master Date: Fri, 22 May 2015 20:09:38 +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: df8e5f7e-cf47-4cfa-bf74-d66782971f7f X-Archives-Hash: 14d1793532c405b2685b670a90ab05b9 commit: 4145312546b2dfef571c04698fa81b545a5be63d Author: Jason Zaman perfinion com> AuthorDate: Fri May 22 19:52:07 2015 +0000 Commit: Jason Zaman gentoo org> CommitDate: Fri May 22 19:52:07 2015 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=41453125 Revert "Introduce init_startstop_service interface", accidentally applied twice This reverts commit c2986eed04bbae7ef6ff1bdad6df31022abdc970. policy/modules/system/init.if | 40 ---------------------------------------- 1 file changed, 40 deletions(-) diff --git a/policy/modules/system/init.if b/policy/modules/system/init.if index acf1fae..61db079 100644 --- a/policy/modules/system/init.if +++ b/policy/modules/system/init.if @@ -1008,46 +1008,6 @@ interface(`init_startstop_service',` ######################################## ## -## Allow the role to start and stop -## labeled services. -## -## -## -## Domain allowed to transition. -## -## -## -## -## The role to be performing this action. -## -## -## -## -## Type to be used as a daemon domain. -## -## -## -## -## Labeled init script file. -## -## -# -interface(`init_startstop_service',` - gen_require(` - role system_r; - ') - - ifndef(`direct_sysadm_daemon',` - # rules for sysvinit / upstart - init_labeled_script_domtrans($1, $4) - domain_system_change_exemption($1) - role_transition $2 $4 system_r; - allow $2 system_r; - ') -') - -######################################## -## ## Start and stop daemon programs directly. ## ##