From: sven.vermeulen@siphos.be (Sven Vermeulen) Date: Sun, 8 Jun 2014 16:36:27 +0200 Subject: [refpolicy] [PATCH 2/3] Deprecate init_daemon_run_dir interface In-Reply-To: <1402238188-32406-1-git-send-email-sven.vermeulen@siphos.be> References: <1402238188-32406-1-git-send-email-sven.vermeulen@siphos.be> Message-ID: <1402238188-32406-3-git-send-email-sven.vermeulen@siphos.be> To: refpolicy@oss.tresys.com List-Id: refpolicy.oss.tresys.com With init_daemon_pid_file supporting class parameters, all calls to init_daemon_run_dir can now be transformed into init_daemon_pid_file calls. Update the init_daemon_run_dir interface so it gives a warning when used, and use the init_daemon_pid_file interface underlyingly. Signed-off-by: Sven Vermeulen --- policy/modules/system/init.if | 5 ++--- policy/modules/system/init.te | 5 ----- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/policy/modules/system/init.if b/policy/modules/system/init.if index a168713..15483b0 100644 --- a/policy/modules/system/init.if +++ b/policy/modules/system/init.if @@ -465,9 +465,8 @@ interface(`init_daemon_run_dir',` type initrc_t; ') - typeattribute $1 daemonrundir; - - files_pid_filetrans(initrc_t, $1, dir, $2) + refpolicywarn(`$0($*) has been deprecated, use init_daemon_pid_file() instead.') + init_daemon_pid_file($1, dir, $2) ') ######################################## diff --git a/policy/modules/system/init.te b/policy/modules/system/init.te index 5d6f8b9..7bc48d5 100644 --- a/policy/modules/system/init.te +++ b/policy/modules/system/init.te @@ -25,8 +25,6 @@ attribute daemon; # Mark file type as a daemon pid file attribute daemonpidfile; -# Mark file type as a daemon run directory -attribute daemonrundir; # # init_t is the domain of the init process. @@ -253,9 +251,6 @@ create_dirs_pattern(initrc_t, daemonpidfile, daemonpidfile) manage_files_pattern(initrc_t, daemonpidfile, daemonpidfile) setattr_dirs_pattern(initrc_t, daemonpidfile, daemonpidfile) -create_dirs_pattern(initrc_t, daemonrundir, daemonrundir) -setattr_dirs_pattern(initrc_t, daemonrundir, daemonrundir) - domtrans_pattern(init_run_all_scripts_domain, initrc_exec_t, initrc_t) manage_dirs_pattern(initrc_t, initrc_state_t, initrc_state_t) -- 1.8.5.5