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

[Sven Vermeulen]

commit:     796f48776b91ee0ff095ed9b42fbaf61c13922f1
Author:     Dominick Grift <dominick.grift <AT> gmail <DOT> com>
AuthorDate: Wed Nov 28 16:43:40 2012 +0000
Commit:     Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
CommitDate: Wed Nov 28 20:20:16 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=796f4877

Changes to the tftp policy modules

Fix interfaces to include directories and symlinks

Signed-off-by: Dominick Grift <dominick.grift <AT> gmail.com>

---
 policy/modules/contrib/tftp.if |    9 ++++++---
 policy/modules/contrib/tftp.te |    2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/policy/modules/contrib/tftp.if b/policy/modules/contrib/tftp.if
index f7c6ea3..9957e30 100644
--- a/policy/modules/contrib/tftp.if
+++ b/policy/modules/contrib/tftp.if
@@ -16,7 +16,9 @@ interface(`tftp_read_content',`
 	')
 
 	files_search_var_lib($1)
-	read_files_pattern($1, tftpdir_t, tftpdir_t)
+	allow $1 tftpdir_t:dir list_dir_perms;
+	allow $1 tftpdir_t:file read_file_perms;
+	allow $1 tftpdir_t:lnk_file read_lnk_file_perms;
 ')
 
 ########################################
@@ -36,8 +38,9 @@ interface(`tftp_manage_rw_content',`
 	')
 
 	files_search_var_lib($1)
-	manage_dirs_pattern($1, tftpdir_rw_t, tftpdir_rw_t)
-	manage_files_pattern($1, tftpdir_rw_t, tftpdir_rw_t)
+	allow $1 tftpdir_rw_t:dir manage_dir_perms;
+	allow $1 tftpdir_rw_t:file manage_file_perms;
+	allow $1 tftpdir_rw_t:lnk_file manage_lnk_file_perms;
 ')
 
 ########################################

diff --git a/policy/modules/contrib/tftp.te b/policy/modules/contrib/tftp.te
index 0cebfd0..f455e70 100644
--- a/policy/modules/contrib/tftp.te
+++ b/policy/modules/contrib/tftp.te
@@ -1,4 +1,4 @@
-policy_module(tftp, 1.12.3)
+policy_module(tftp, 1.12.4)
 
 ########################################
 #