- Update to upstream

This commit is contained in:
Daniel J Walsh 2009-07-16 11:06:59 +00:00
parent 2360ff9f3f
commit 722d1eba15

View File

@ -5508,8 +5508,8 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
+/usr/bin/metacity -- gen_context(system_u:object_r:wm_exec_t,s0)
diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wm.if serefpolicy-3.6.22/policy/modules/apps/wm.if
--- nsaserefpolicy/policy/modules/apps/wm.if 1969-12-31 19:00:00.000000000 -0500
+++ serefpolicy-3.6.22/policy/modules/apps/wm.if 2009-07-15 14:06:36.000000000 -0400
@@ -0,0 +1,105 @@
+++ serefpolicy-3.6.22/policy/modules/apps/wm.if 2009-07-16 07:00:40.000000000 -0400
@@ -0,0 +1,108 @@
+## <summary>Window Manager.</summary>
+
+########################################
@ -5562,9 +5562,12 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
+ type wm_exec_t;
+ ')
+
+ type $1_wm_t;
+ domain_type($1_wm_t)
+ domain_entry_file($1_wm_t, wm_exec_t)
+ role $2 types $1_wm_t;
+
+ domtrans_pattern($3, wm_exec_t, wm_t)
+ domtrans_pattern($3, wm_exec_t, $1_wm_t)
+
+ corecmd_bin_domtrans($1_wm_t, $1_t)
+ corecmd_shell_domtrans($1_wm_t, $1_t)
@ -20007,7 +20010,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
+')
diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-3.6.22/policy/modules/services/setroubleshoot.te
--- nsaserefpolicy/policy/modules/services/setroubleshoot.te 2009-07-14 14:19:57.000000000 -0400
+++ serefpolicy-3.6.22/policy/modules/services/setroubleshoot.te 2009-07-15 14:06:36.000000000 -0400
+++ serefpolicy-3.6.22/policy/modules/services/setroubleshoot.te 2009-07-16 07:05:31.000000000 -0400
@@ -22,13 +22,19 @@
type setroubleshoot_var_run_t;
files_pid_file(setroubleshoot_var_run_t)
@ -20105,10 +20108,10 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
+#
+# setroubleshoot_fixit local policy
+#
+allow setroubleshootd_fixit_t self:fifo_file rw_fifo_file_perms;
+allow setroubleshoot_fixit_t self:fifo_file rw_fifo_file_perms;
+
+corecmd_exec_bin(setroubleshootd_fixit_t)
+corecmd_exec_shell(setroubleshootd_fixit_t)
+corecmd_exec_bin(setroubleshoot_fixit_t)
+corecmd_exec_shell(setroubleshoot_fixit_t)
+
+seutil_domtrans_restorecon(setroubleshoot_fixit_t)
+