[gentoo-commits] proj/hardened-refpolicy:swift commit in: policy/modules/contrib/

[Sven Vermeulen]

commit:     7f5ece84232e3a6704b7e781203f4038a45417c3
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Mon Aug 24 15:10:09 2015 +0000
Commit:     Sven Vermeulen <swift <AT> gentoo <DOT> 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 })