gdm r6672 - in trunk: . data

[halfline svn gnome org]

Author: halfline
Date: Tue Jan 27 15:18:36 2009
New Revision: 6672
URL: http://svn.gnome.org/viewvc/gdm?rev=6672&view=rev

Log:
2009-01-27  Ray Strode  <rstrode redhat com>

	* data/gdm.conf.in: Rework dbus policy file to
	be more correct.  Patch from Colin Walters
	(bug 564767).

Modified:
   trunk/ChangeLog
   trunk/data/gdm.conf.in

Modified: trunk/data/gdm.conf.in
==============================================================================
--- trunk/data/gdm.conf.in	(original)
+++ trunk/data/gdm.conf.in	Tue Jan 27 15:18:36 2009
@@ -7,52 +7,76 @@
   <policy user="root">
     <allow own="org.gnome.DisplayManager"/>
 
-    <allow send_interface="org.gnome.DisplayManager.Manager"/>
-    <allow send_interface="org.gnome.DisplayManager.Display"/>
-    <allow send_interface="org.gnome.DisplayManager.LocalDisplayFactory"/>
-    <allow send_interface="org.gnome.DisplayManager.Settings"/>
-    <allow send_interface="org.gnome.DisplayManager.Slave"/>
-    <allow send_interface="org.gnome.DisplayManager.Session"/>
+    <allow send_destination="org.gnome.DisplayManager"
+           send_interface="org.gnome.DisplayManager.Manager"/>
+    <allow send_destination="org.gnome.DisplayManager"
+           send_interface="org.gnome.DisplayManager.Display"/>
+    <allow send_destination="org.gnome.DisplayManager"
+           send_interface="org.gnome.DisplayManager.LocalDisplayFactory"/>
+    <allow send_destination="org.gnome.DisplayManager"
+           send_interface="org.gnome.DisplayManager.Settings"/>
+    <allow send_destination="org.gnome.DisplayManager"
+           send_interface="org.gnome.DisplayManager.Slave"/>
+    <allow send_destination="org.gnome.DisplayManager"
+           send_interface="org.gnome.DisplayManager.Session"/>
     <allow send_destination="org.gnome.DisplayManager"
            send_interface="org.gnome.DBus.Properties" />
   </policy>
 
   <policy context="default">
-    <deny send_interface="org.gnome.DisplayManager.Manager"/>
-    <deny send_interface="org.gnome.DisplayManager.Display"/>
-    <deny send_interface="org.gnome.DisplayManager.LocalDisplayFactory"/>
-    <deny send_interface="org.gnome.DisplayManager.Settings"/>
-    <deny send_interface="org.gnome.DisplayManager.Slave"/>
-    <deny send_interface="org.gnome.DisplayManager.Session"/>
+    <deny send_destination="org.gnome.DisplayManager"
+          send_interface="org.gnome.DisplayManager.Manager"/>
+    <deny send_destination="org.gnome.DisplayManager"
+          send_interface="org.gnome.DisplayManager.Display"/>
+    <deny send_destination="org.gnome.DisplayManager"
+          send_interface="org.gnome.DisplayManager.LocalDisplayFactory"/>
+    <deny send_destination="org.gnome.DisplayManager"
+          send_interface="org.gnome.DisplayManager.Settings"/>
+    <deny send_destination="org.gnome.DisplayManager"
+          send_interface="org.gnome.DisplayManager.Slave"/>
+    <deny send_destination="org.gnome.DisplayManager"
+          send_interface="org.gnome.DisplayManager.Session"/>
     <deny send_destination="org.gnome.DisplayManager"
           send_interface="org.gnome.DBus.Properties" />
 
-    <allow send_interface="org.gnome.DisplayManager.Display"
+    <allow send_destination="org.gnome.DisplayManager"
+           send_interface="org.gnome.DisplayManager.Display"
            send_member="GetId"/>
-    <allow send_interface="org.gnome.DisplayManager.Display"
+    <allow send_destination="org.gnome.DisplayManager"
+           send_interface="org.gnome.DisplayManager.Display"
            send_member="GetRemoteHostname"/>
-    <allow send_interface="org.gnome.DisplayManager.Display"
+    <allow send_destination="org.gnome.DisplayManager"
+           send_interface="org.gnome.DisplayManager.Display"
            send_member="GetSeatId"/>
-    <allow send_interface="org.gnome.DisplayManager.Display"
+    <allow send_destination="org.gnome.DisplayManager"
+           send_interface="org.gnome.DisplayManager.Display"
            send_member="GetX11DisplayName"/>
-    <allow send_interface="org.gnome.DisplayManager.Display"
+    <allow send_destination="org.gnome.DisplayManager"
+           send_interface="org.gnome.DisplayManager.Display"
            send_member="GetX11DisplayNumber"/>
-    <allow send_interface="org.gnome.DisplayManager.Display"
+    <allow send_destination="org.gnome.DisplayManager"
+           send_interface="org.gnome.DisplayManager.Display"
            send_member="IsLocal"/>
 
-    <allow send_interface="org.gnome.DisplayManager.LocalDisplayFactory"
+    <allow send_destination="org.gnome.DisplayManager"
+           send_interface="org.gnome.DisplayManager.LocalDisplayFactory"
            send_member="CreateTransientDisplay"/>
 
-    <allow send_interface="org.gnome.DisplayManager.Manager"
+    <allow send_destination="org.gnome.DisplayManager"
+           send_interface="org.gnome.DisplayManager.Manager"
            send_member="GetDisplays"/>
 
   </policy>
 
   <policy user="@GDM_USERNAME@">
-    <allow send_interface="org.gnome.DisplayManager.Manager"/>
-    <allow send_interface="org.gnome.DisplayManager.Display"/>
-    <allow send_interface="org.gnome.DisplayManager.LocalDisplayFactory"/>
-    <allow send_interface="org.gnome.DisplayManager.Settings"/>
+    <allow send_destination="org.gnome.DisplayManager"
+           send_interface="org.gnome.DisplayManager.Manager"/>
+    <allow send_destination="org.gnome.DisplayManager"
+           send_interface="org.gnome.DisplayManager.Display"/>
+    <allow send_destination="org.gnome.DisplayManager"
+           send_interface="org.gnome.DisplayManager.LocalDisplayFactory"/>
+    <allow send_destination="org.gnome.DisplayManager"
+           send_interface="org.gnome.DisplayManager.Settings"/>
     <allow send_destination="org.gnome.DisplayManager"
            send_interface="org.gnome.DBus.Properties" />
   </policy>