From 821f78b28d63bf622bd7b942c1240c0c7b4c0d88 Mon Sep 17 00:00:00 2001 From: Chris PeBenito Date: Mon, 12 Jun 2006 16:55:18 +0000 Subject: [PATCH] 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 9c68d4a7..bc1fed4c 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 1e7d3321..b8824eb0 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 };