Try to add devicekit_relabel_log_files() instead of filename trans for apmd since...

diff --git a/policy/modules/services/apm.te b/policy/modules/services/apm.te
index 97a81724e992d683176b20f239a8ad74a252a6bb..01d69d4c65483d3a307e7ed43265ac1c38d21cb6 100644 (file)
--- 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 84332a1c65a854a387f4920502766e92e0dbba57..df73dffa9e349b8b6de9ad16a933d96f75ddea9a 100644 (file)
--- 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")
 ')
 
 ########################################