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

[Sven Vermeulen]

commit:     cf9fc00b57371089ca2df94983ece05968580d10
Author:     Dominick Grift <dominick.grift <AT> gmail <DOT> com>
AuthorDate: Wed Oct 31 15:35:03 2012 +0000
Commit:     Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
CommitDate: Wed Oct 31 18:06:51 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=cf9fc00b

Changes to the inn policy module

This interface is for system logger which takes care of innd logs on
behalf of inn

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

---
 policy/modules/contrib/inn.fc |    2 +-
 policy/modules/contrib/inn.if |   30 +++++++++++++++++++++++++++++-
 policy/modules/contrib/inn.te |    2 +-
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/policy/modules/contrib/inn.fc b/policy/modules/contrib/inn.fc
index d35d1cc..7b6e373 100644
--- a/policy/modules/contrib/inn.fc
+++ b/policy/modules/contrib/inn.fc
@@ -48,7 +48,7 @@
 /usr/lib/news/bin/sm	--	gen_context(system_u:object_r:innd_exec_t,s0)
 /usr/lib/news/bin/startinnfeed	--	gen_context(system_u:object_r:innd_exec_t,s0)
 
-/var/log/news(/.*)?	gen_context(system_u:object_r:innd_log_t,s0)
+/var/log/news.*	gen_context(system_u:object_r:innd_log_t,s0)
 
 /var/run/innd(/.*)?	gen_context(system_u:object_r:innd_var_run_t,s0)
 /var/run/innd\.pid	--	gen_context(system_u:object_r:innd_var_run_t,s0)

diff --git a/policy/modules/contrib/inn.if b/policy/modules/contrib/inn.if
index 27afa8f..eb87f23 100644
--- a/policy/modules/contrib/inn.if
+++ b/policy/modules/contrib/inn.if
@@ -54,12 +54,40 @@ interface(`inn_manage_log',`
 		type innd_log_t;
 	')
 
-	logging_rw_generic_log_dirs($1)
 	manage_files_pattern($1, innd_log_t, innd_log_t)
 ')
 
 ########################################
 ## <summary>
+##	Create specified objects in generic
+##	log directories with the innd log file type.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <param name="object_class">
+##	<summary>
+##	Class of the object being created.
+##	</summary>
+## </param>
+## <param name="name" optional="true">
+##	<summary>
+##	The name of the object being created.
+##	</summary>
+## </param>
+#
+interface(`inn_generic_log_filetrans_innd_log',`
+	gen_require(`
+		type innd_log_t;
+	')
+
+	logging_log_filetrans($1, innd_log_t, $2, $3)
+')
+
+########################################
+## <summary>
 ##	Create, read, write, and delete
 ##	innd pid content.
 ## </summary>

diff --git a/policy/modules/contrib/inn.te b/policy/modules/contrib/inn.te
index 75b8d8e..58cbdb2 100644
--- a/policy/modules/contrib/inn.te
+++ b/policy/modules/contrib/inn.te
@@ -1,4 +1,4 @@
-policy_module(inn, 1.10.1)
+policy_module(inn, 1.10.2)
 
 ########################################
 #