From bdc7622e86bdab8f531794b331cdd17da5b64898 Mon Sep 17 00:00:00 2001
From: Chris PeBenito <cpebenito@tresys.com>
Date: Wed, 16 Mar 2011 08:20:28 -0400
Subject: [PATCH] Remove redundant system dbus permissions with cpufreqselector
 and incorrect xdm dbus permission.

---
 policy/modules/apps/cpufreqselector.if | 21 ---------------------
 policy/modules/apps/cpufreqselector.te |  2 +-
 policy/modules/services/dbus.te        |  6 +-----
 policy/modules/services/xserver.te     |  6 +-----
 4 files changed, 3 insertions(+), 32 deletions(-)

diff --git a/policy/modules/apps/cpufreqselector.if b/policy/modules/apps/cpufreqselector.if
index 932fa5321..ed949751e 100644
--- a/policy/modules/apps/cpufreqselector.if
+++ b/policy/modules/apps/cpufreqselector.if
@@ -1,22 +1 @@
 ## <summary>Command-line CPU frequency settings.</summary>
-
-########################################
-## <summary>
-##	Send and receive messages from
-##	cpufreq-selector over dbus.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`cpufreqselector_dbus_chat',`
-	gen_require(`
-		type cpufreqselector_t;
-		class dbus send_msg;
-	')
-
-	allow $1 cpufreqselector_t:dbus send_msg;
-	allow cpufreqselector_t $1:dbus send_msg;
-')
diff --git a/policy/modules/apps/cpufreqselector.te b/policy/modules/apps/cpufreqselector.te
index e51e7f513..79539d132 100644
--- a/policy/modules/apps/cpufreqselector.te
+++ b/policy/modules/apps/cpufreqselector.te
@@ -1,4 +1,4 @@
-policy_module(cpufreqselector, 1.2.1)
+policy_module(cpufreqselector, 1.2.2)
 
 ########################################
 #
diff --git a/policy/modules/services/dbus.te b/policy/modules/services/dbus.te
index bde765168..1bff6ee70 100644
--- a/policy/modules/services/dbus.te
+++ b/policy/modules/services/dbus.te
@@ -1,4 +1,4 @@
-policy_module(dbus, 1.14.2)
+policy_module(dbus, 1.14.3)
 
 gen_require(`
 	class dbus all_dbus_perms;
@@ -140,10 +140,6 @@ optional_policy(`
 	bind_domtrans(system_dbusd_t)
 ')
 
-optional_policy(`
-	cpufreqselector_dbus_chat(system_dbusd_t)
-')
-
 optional_policy(`
 	policykit_dbus_chat(system_dbusd_t)
 	policykit_domtrans_auth(system_dbusd_t)
diff --git a/policy/modules/services/xserver.te b/policy/modules/services/xserver.te
index 6c01261ee..169657bf7 100644
--- a/policy/modules/services/xserver.te
+++ b/policy/modules/services/xserver.te
@@ -1,4 +1,4 @@
-policy_module(xserver, 3.5.4)
+policy_module(xserver, 3.5.5)
 
 gen_require(`
 	class x_drawable all_x_drawable_perms;
@@ -516,10 +516,6 @@ optional_policy(`
 	consoletype_exec(xdm_t)
 ')
 
-optional_policy(`
-	cpufreqselector_dbus_chat(xdm_t)
-')
-
 optional_policy(`
 	# Talk to the console mouse server.
 	gpm_stream_connect(xdm_t)