dbus/bus policy.c,1.22,1.22.2.1 session.conf.in,1.8,1.8.2.1

[Joe Shaw]

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

Modified Files:
      Tag: dbus-0-23
	policy.c session.conf.in 
Log Message:
2005-02-18  Joe Shaw  <joeshaw at novell.com>
                                                                                
        * NEWS: Update for 0.23.2
                                                                                
        * configure.in: Release 0.23.2

2005-02-16  Joe Shaw  <joeshaw at novell.com>

Index: policy.c
===================================================================
RCS file: /cvs/dbus/dbus/bus/policy.c,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -u -d -r1.22 -r1.22.2.1
--- policy.c	25 Aug 2004 22:11:49 -0000	1.22
+++ policy.c	18 Feb 2005 18:18:32 -0000	1.22.2.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.2.1
diff -u -d -r1.8 -r1.8.2.1
--- session.conf.in	25 Oct 2004 18:48:58 -0000	1.8
+++ session.conf.in	18 Feb 2005 18:18:32 -0000	1.8.2.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