RHEL-4: Import dbus-0.22-user-has-same-id.patch

diff --git a/bus/policy.c b/bus/policy.c
index 107e9a2003d48b6db72a198f2a3a7fd61a61ab1c..a363315b89f3a32ce986228350e811f5d21f073a 100644 (file)
--- a/bus/policy.c
+++ b/bus/policy.c
@@ -453,8 +453,9 @@ bus_policy_allow_user (BusPolicy        *policy,
                      uid);
       return FALSE;
     }
-  
-  allowed = FALSE;
+
+  /* Default to "user owning bus" or root can connect */
+  allowed = uid == _dbus_getuid ();
 
   allowed = list_allows_user (allowed,
                               &policy->default_rules,

diff --git a/bus/session.conf.in b/bus/session.conf.in
index 6741f3d1fba1337088c520e07a4560c8a61da756..810daa24af9202639d6fced38f2b380f8252636a 100644 (file)
--- a/bus/session.conf.in
+++ b/bus/session.conf.in
@@ -19,8 +19,6 @@
     <allow eavesdrop="true"/>
     <!-- Allow anyone to own anything -->
     <allow own="*"/>
-    <!-- Allow any user to connect -->
-    <allow user="*"/>
   </policy>
 
   <!-- This is included last so local configuration can override what's