[gdm: 16/70] Rework dbus policy file to be more correct. Patch from Colin Walters (bug

[Ray Strode <halfline src gnome org>]

commit ef5b3ada6f69fe1c3ad07386909fc99128698adb
Author: Ray Strode <rstrode redhat com>
Date:   Tue Jan 27 15:18:36 2009 +0000

    Rework dbus policy file to be more correct. Patch from Colin Walters (bug
    
    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).
    
    svn path=/trunk/; revision=6672
---
 ChangeLog        |    6 ++++
 data/gdm.conf.in |   72 ++++++++++++++++++++++++++++++++++++------------------
 2 files changed, 54 insertions(+), 24 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 44d850c..b1cc8a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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).
+
 2009-01-23  Matthias Clasen  <mclasen redhat com>
 
 	* gui/simple-greeter/gdm-greeter-login-window.glade: Don't
diff --git a/data/gdm.conf.in b/data/gdm.conf.in
index bda9733..d3b8de3 100644
--- a/data/gdm.conf.in
+++ b/data/gdm.conf.in
@@ -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>