[selinux-policy: 1509/3172] fix dbus_user_bus_client_template

[Daniel J Walsh]

commit 821f78b28d63bf622bd7b942c1240c0c7b4c0d88
Author: Chris PeBenito <cpebenito at tresys.com>
Date:   Mon Jun 12 16:55:18 2006 +0000

    fix dbus_user_bus_client_template

 refpolicy/policy/modules/services/dbus.if |    8 ++------
 refpolicy/policy/modules/services/dbus.te |    2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)
---
diff --git a/refpolicy/policy/modules/services/dbus.if b/refpolicy/policy/modules/services/dbus.if
index 9c68d4a..bc1fed4 100644
--- a/refpolicy/policy/modules/services/dbus.if
+++ b/refpolicy/policy/modules/services/dbus.if
@@ -235,8 +235,7 @@ template(`dbus_system_bus_client_template',`
 #
 template(`dbus_user_bus_client_template',`
 	gen_require(`
-		type $1_dbusd_t, $1_dbusd_t;
-		type $1_dbusd_var_run_t;
+		type $1_dbusd_t;
 		class dbus send_msg;
 	')
 
@@ -247,10 +246,7 @@ template(`dbus_user_bus_client_template',`
 	allow $2_dbusd_$1_t { $1_dbusd_t self }:dbus send_msg;
 
 	# For connecting to the bus
-	files_search_pids($3)
-	allow $3 system_dbusd_var_run_t:dir search;
-	allow $3 system_dbusd_var_run_t:sock_file write;
-	allow $3 system_dbusd_t:unix_stream_socket connectto;
+	allow $3 $1_dbusd_t:unix_stream_socket connectto;
 ')
 
 ########################################
diff --git a/refpolicy/policy/modules/services/dbus.te b/refpolicy/policy/modules/services/dbus.te
index 1e7d332..b8824eb 100644
--- a/refpolicy/policy/modules/services/dbus.te
+++ b/refpolicy/policy/modules/services/dbus.te
@@ -1,5 +1,5 @@
 
-policy_module(dbus,1.2.4)
+policy_module(dbus,1.2.5)
 
 gen_require(`
 	class dbus { send_msg acquire_svc };