commit:     22db9ffa981508adc52f3751fb285cce44f98c29
Author:     James Carter <jwcart2 <AT> tycho <DOT> nsa <DOT> gov>
AuthorDate: Wed Apr 11 18:56:38 2018 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sun Apr 22 11:53:03 2018 +0000
URL:        
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=22db9ffa

Remove undeclared identifiers from shorewall interfaces

Both shorewall_read_pid_files() and shorewall_rw_pid_files() use the
undeclared type shorewall_var_run_t. Removed statements referring to this
type and marked the interfaces as deprecated because they no longer do
anything useful.

Neither interface is called in the policy.

Signed-off-by: James Carter <jwcart2 <AT> tycho.nsa.gov>

 policy/modules/contrib/shorewall.if | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/policy/modules/contrib/shorewall.if 
b/policy/modules/contrib/shorewall.if
index 108ce759..119ba279 100644
--- a/policy/modules/contrib/shorewall.if
+++ b/policy/modules/contrib/shorewall.if
@@ -62,38 +62,28 @@ interface(`shorewall_read_config',`
 ## <summary>
 ##     Read shorewall pid files.
 ## </summary>
-## <param name="domain">
+## <param name="domain" unused="true">
 ##     <summary>
 ##     Domain allowed access.
 ##     </summary>
 ## </param>
 #
 interface(`shorewall_read_pid_files',`
-       gen_require(`
-               type shorewall_var_run_t;
-       ')
-
-       files_search_pids($1)
-       read_files_pattern($1, shorewall_var_run_t, shorewall_var_run_t)
+       refpolicywarn(`$0($*) has been deprecated')
 ')
 
 #######################################
 ## <summary>
 ##     Read and write shorewall pid files.
 ## </summary>
-## <param name="domain">
+## <param name="domain" unused="true">
 ##     <summary>
 ##     Domain allowed access.
 ##     </summary>
 ## </param>
 #
 interface(`shorewall_rw_pid_files',`
-       gen_require(`
-               type shorewall_var_run_t;
-       ')
-
-       files_search_pids($1)
-       rw_files_pattern($1, shorewall_var_run_t, shorewall_var_run_t)
+       refpolicywarn(`$0($*) has been deprecated')
 ')
 
 ######################################

Reply via email to