From: Miroslav Grepl <mgrepl@redhat.com>
Date: Mon, 14 Nov 2011 18:04:24 +0000 (+0000)
Subject: Try to add devicekit_relabel_log_files() instead of filename trans for apmd since... 
X-Git-Tag: 000~108^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7282cc20f2d5bc7819bb11c9aadc128bf0ed1ed8;p=people%2Fstevee%2Fselinux-policy.git

Try to add devicekit_relabel_log_files() instead of filename trans for apmd since there is a conflict between apmd_var_log_t and devicekit_var_log_t
---

diff --git a/policy/modules/services/apm.te b/policy/modules/services/apm.te
index 97a81724..01d69d4c 100644
--- a/policy/modules/services/apm.te
+++ b/policy/modules/services/apm.te
@@ -195,6 +195,7 @@ optional_policy(`
 optional_policy(`
 	devicekit_manage_pid_files(apmd_t)
 	devicekit_manage_log_files(apmd_t)
+	devicekit_relabel_log_files(apmd_t)
 ')
 
 optional_policy(`
diff --git a/policy/modules/services/devicekit.if b/policy/modules/services/devicekit.if
index 84332a1c..df73dffa 100644
--- a/policy/modules/services/devicekit.if
+++ b/policy/modules/services/devicekit.if
@@ -290,6 +290,25 @@ interface(`devicekit_manage_pid_files',`
 	manage_files_pattern($1, devicekit_var_run_t, devicekit_var_run_t)
 ')
 
+#######################################
+## <summary>
+##  Relabel devicekit LOG files.
+## </summary>
+## <param name="domain">
+##  <summary>
+##  Domain allowed access.
+##  </summary>
+## </param>
+#
+interface(`devicekit_relabel_log_files',`
+    gen_require(`
+        type devicekit_var_log_t;
+    ')
+
+    logging_search_logs($1)
+    relabel_files_pattern($1, devicekit_var_log_t, devicekit_var_log_t)
+')
+
 ########################################
 ## <summary>
 ##	Manage devicekit LOG files.
@@ -307,8 +326,8 @@ interface(`devicekit_manage_log_files',`
 
 	logging_search_logs($1)
 	manage_files_pattern($1, devicekit_var_log_t, devicekit_var_log_t)
-	logging_log_filetrans($1, devicekit_var_log_t, file, "pm-powersave.log")
-	logging_log_filetrans($1, devicekit_var_log_t, file, "pm-suspend.log")
+	#logging_log_filetrans($1, devicekit_var_log_t, file, "pm-powersave.log")
+	#logging_log_filetrans($1, devicekit_var_log_t, file, "pm-suspend.log")
 ')
 
 ########################################