[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/system/

[Jason Zaman]

commit:     6fb566c033803208cc19261105ce611225d5f08d
Author:     Chris PeBenito <pebenito <AT> ieee <DOT> org>
AuthorDate: Sat Feb 25 13:39:58 2017 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sat Feb 25 16:43:11 2017 +0000
URL:        
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=6fb566c0

init: Move interface and whitespace change.

 policy/modules/system/init.if | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/policy/modules/system/init.if b/policy/modules/system/init.if
index b1778f1a..8d65e648 100644
--- a/policy/modules/system/init.if
+++ b/policy/modules/system/init.if
@@ -1137,12 +1137,12 @@ interface(`init_var_lib_filetrans',`
 
 ######################################
 ## <summary>
-##  Allow search  directory in the /run/systemd directory.
+##     Allow search  directory in the /run/systemd directory.
 ## </summary>
 ## <param name="domain">
-##  <summary>
-##  Domain allowed access.
-##  </summary>
+##     <summary>
+##     Domain allowed access.
+##     </summary>
 ## </param>
 #
 interface(`init_search_pids',`
@@ -2270,7 +2270,7 @@ interface(`init_read_script_tmp_files',`
 
 ########################################
 ## <summary>
-##     Read and write init script temporary data.
+##     Read and write init script inherited temporary data.
 ## </summary>
 ## <param name="domain">
 ##     <summary>
@@ -2278,18 +2278,17 @@ interface(`init_read_script_tmp_files',`
 ##     </summary>
 ## </param>
 #
-interface(`init_rw_script_tmp_files',`
+interface(`init_rw_inherited_script_tmp_files',`
        gen_require(`
                type initrc_tmp_t;
        ')
 
-       files_search_tmp($1)
-       rw_files_pattern($1, initrc_tmp_t, initrc_tmp_t)
+       allow $1 initrc_tmp_t:file rw_inherited_file_perms;
 ')
 
 ########################################
 ## <summary>
-##     Read and write init script inherited temporary data.
+##     Read and write init script temporary data.
 ## </summary>
 ## <param name="domain">
 ##     <summary>
@@ -2297,12 +2296,13 @@ interface(`init_rw_script_tmp_files',`
 ##     </summary>
 ## </param>
 #
-interface(`init_rw_inherited_script_tmp_files',`
+interface(`init_rw_script_tmp_files',`
        gen_require(`
                type initrc_tmp_t;
        ')
 
-       allow $1 initrc_tmp_t:file rw_inherited_file_perms;
+       files_search_tmp($1)
+       rw_files_pattern($1, initrc_tmp_t, initrc_tmp_t)
 ')
 
 ########################################