dbus/bus policy.c,1.22,1.22.10.1 session.conf.in,1.8,1.8.10.1

[John Palmieri]

Update of /cvs/dbus/dbus/bus
In directory gabe:/tmp/cvs-serv711/bus

Modified Files:
      Tag: DBUS_0_36_2
	policy.c session.conf.in 
Log Message:
* Release 0.36.2

* Add Havoc's patch that never got applied to HEAD (Bug #2436):

* bus/policy.c (bus_policy_allow_user): change default "user is
allowed" to be "user has same uid as the bus itself"; any
allow/deny rules will override.

* bus/session.conf.in: don't allow all users, since now by default
the user that ran the bus can connect.



Index: policy.c
===================================================================
RCS file: /cvs/dbus/dbus/bus/policy.c,v
retrieving revision 1.22
retrieving revision 1.22.10.1
diff -u -d -r1.22 -r1.22.10.1
--- policy.c	25 Aug 2004 22:11:49 -0000	1.22
+++ policy.c	29 Aug 2005 18:46:23 -0000	1.22.10.1
@@ -453,8 +453,9 @@
                      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,

Index: session.conf.in
===================================================================
RCS file: /cvs/dbus/dbus/bus/session.conf.in,v
retrieving revision 1.8
retrieving revision 1.8.10.1
diff -u -d -r1.8 -r1.8.10.1
--- session.conf.in	25 Oct 2004 18:48:58 -0000	1.8
+++ session.conf.in	29 Aug 2005 18:46:23 -0000	1.8.10.1
@@ -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