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 175C413888F for ; Sat, 10 Oct 2015 12:11:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AA16821C032; Sat, 10 Oct 2015 12:11:16 +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 88D5121C030 for ; Sat, 10 Oct 2015 12:11:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C0975340860 for ; Sat, 10 Oct 2015 12:11:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2227ADF7 for ; Sat, 10 Oct 2015 12:11:08 +0000 (UTC) From: "Sven Vermeulen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sven Vermeulen" Message-ID: <1440702511.7f5ece84232e3a6704b7e781203f4038a45417c3.swift@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:swift commit in: policy/modules/contrib/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: policy/modules/contrib/hadoop.if X-VCS-Directories: policy/modules/contrib/ X-VCS-Committer: swift X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: 7f5ece84232e3a6704b7e781203f4038a45417c3 X-VCS-Branch: swift Date: Sat, 10 Oct 2015 12:11: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-Archives-Salt: f5172974-72aa-4c32-9166-2a67bc414a5d X-Archives-Hash: 19f73a2e9d0897c1048f897f056d024b commit: 7f5ece84232e3a6704b7e781203f4038a45417c3 Author: Jason Zaman perfinion com> AuthorDate: Mon Aug 24 15:10:09 2015 +0000 Commit: Sven Vermeulen gentoo org> CommitDate: Thu Aug 27 19:08:31 2015 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=7f5ece84 hadoop: init_startstop_service() can not take attributes policy/modules/contrib/hadoop.if | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/policy/modules/contrib/hadoop.if b/policy/modules/contrib/hadoop.if index a0a819f..5908119 100644 --- a/policy/modules/contrib/hadoop.if +++ b/policy/modules/contrib/hadoop.if @@ -426,7 +426,6 @@ interface(`hadoop_admin',` attribute hadoop_domain; attribute hadoop_initrc_domain; - attribute hadoop_init_script_file; attribute hadoop_pid_file; attribute hadoop_lock_file; attribute hadoop_log_file; @@ -436,12 +435,22 @@ interface(`hadoop_admin',` type hadoop_t, hadoop_etc_t, hadoop_hsperfdata_t; type zookeeper_t, zookeeper_etc_t, zookeeper_server_t; type zookeeper_server_var_t; + + type hadoop_datanode_initrc_t, hadoop_datanode_initrc_exec_t; + type hadoop_jobtracker_initrc_t, hadoop_jobtracker_initrc_exec_t; + type hadoop_namenode_initrc_t, hadoop_namenode_initrc_exec_t; + type hadoop_secondarynamenode_initrc_t, hadoop_secondarynamenode_initrc_exec_t; + type hadoop_tasktracker_initrc_t, hadoop_tasktracker_initrc_exec_t; ') allow $1 { hadoop_domain hadoop_initrc_domain hadoop_t zookeeper_t zookeeper_server_t }:process { ptrace signal_perms }; ps_process_pattern($1, { hadoop_domain hadoop_initrc_domain hadoop_t zookeeper_t zookeeper_server_t }) - init_startstop_service($1, $2, hadoop_domain, hadoop_init_script_file) + init_startstop_service($1, $2, hadoop_datanode_initrc_t, hadoop_datanode_initrc_exec_t) + init_startstop_service($1, $2, hadoop_jobtracker_initrc_t, hadoop_jobtracker_initrc_exec_t) + init_startstop_service($1, $2, hadoop_namenode_initrc_t, hadoop_namenode_initrc_exec_t) + init_startstop_service($1, $2, hadoop_secondarynamenode_initrc_t, hadoop_secondarynamenode_initrc_exec_t) + init_startstop_service($1, $2, hadoop_tasktracker_initrc_t, hadoop_tasktracker_initrc_exec_t) files_search_etc($1) admin_pattern($1, { hadoop_etc_t zookeeper_etc_t })