← Back to branch summary

~ubuntu-branches/ubuntu/lucid/consolekit/lucid-proposed

« back to all changes in this revision

Viewing changes to debian/patches/00git-dbus_policy.patch

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2009-07-15 11:45:56 UTC
  • Revision ID: james.westby@ubuntu.com-20090715114556-mzih0q1yr33vofem
Tags: 0.3.0-2ubuntu6
https://launchpad.net/bugs/399531
* Drop 04-consolekit_park.patch: Not necessary with new gdm any more.
* Rename patches which are in upstream git now:
  - 05-dbus_policy.patch → 00git-dbus_policy.patch
  - 05-pam-add-nox11.patch → 00git-pam-add-nox11.patch
  - 08-fix-double-close.patch → 00git-fix-double-close.patch
  - 09-directory-handle-leak.patch → 00git-directory-handle-leak.patch
  - 10-file_monitor_remove_watch_crash.patch → 00git-file_monitor_remove_watch_crash.patch
  - 11-unref-dbus-proxy.patch  → 00git-unref-dbus-proxy.patch 
* 12-allow-get-sessions.patch: Add upstream bug link.
* 07-polkit1.patch: Allow CanRestart and CanStop in D-BUS policy. (LP: #399531)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/00git-dbus_policy.patch
 
1
commit e0d9cc359b3099307067107b59ec691418e280b8
 
2
Author: Colin Walters <walters@verbum.org>
 
3
Date:   Sun Jan 18 13:06:37 2009 -0500
 
4
 
 
5
    fix up D-Bus permissions
 
6
 
 
7
Index: consolekit-0.3.0/data/ConsoleKit.conf
 
8
===================================================================
 
9
--- consolekit-0.3.0.orig/data/ConsoleKit.conf  2009-03-03 01:48:13.000000000 +0100
 
10
+++ consolekit-0.3.0/data/ConsoleKit.conf       2009-03-03 01:48:28.000000000 +0100
 
11
@@ -8,88 +8,128 @@
 
12
     <allow own="org.freedesktop.ConsoleKit"/>
 
13
 
 
14
     <!-- Allow all methods on interfaces -->
 
15
-    <allow send_interface="org.freedesktop.ConsoleKit.Manager"/>
 
16
-    <allow send_interface="org.freedesktop.ConsoleKit.Seat"/>
 
17
-    <allow send_interface="org.freedesktop.ConsoleKit.Session"/>
 
18
+    <allow send_destination="org.freedesktop.ConsoleKit"/>
 
19
   </policy>
 
20
 
 
21
   <!-- Deny all and then allow some methods on interfaces -->
 
22
   <policy context="default">
 
23
-    <deny send_interface="org.freedesktop.ConsoleKit.Manager"/>
 
24
-    <deny send_interface="org.freedesktop.ConsoleKit.Seat"/>
 
25
-    <deny send_interface="org.freedesktop.ConsoleKit.Session"/>
 
26
+    <allow send_destination="org.freedesktop.ConsoleKit"
 
27
+           send_interface="org.freedesktop.DBus.Introspectable"/>
 
28
+    <deny send_destination="org.freedesktop.ConsoleKit"
 
29
+          send_interface="org.freedesktop.ConsoleKit.Manager"/>
 
30
+    <deny send_destination="org.freedesktop.ConsoleKit"
 
31
+          send_interface="org.freedesktop.ConsoleKit.Seat"/>
 
32
+    <deny send_destination="org.freedesktop.ConsoleKit"
 
33
+          send_interface="org.freedesktop.ConsoleKit.Session"/>
 
34
     <deny send_destination="org.freedesktop.ConsoleKit"
 
35
           send_interface="org.freedesktop.DBus.Properties" />
 
36
 
 
37
-    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
 
38
+    <allow send_destination="org.freedesktop.ConsoleKit"
 
39
+           send_interface="org.freedesktop.ConsoleKit.Manager"
 
40
            send_member="Restart"/>
 
41
-    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
 
42
+    <allow send_destination="org.freedesktop.ConsoleKit"
 
43
+           send_interface="org.freedesktop.ConsoleKit.Manager"
 
44
            send_member="Stop"/>
 
45
-    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
 
46
+    <allow send_destination="org.freedesktop.ConsoleKit"
 
47
+           send_interface="org.freedesktop.ConsoleKit.Manager"
 
48
            send_member="OpenSession"/>
 
49
-    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
 
50
+    <allow send_destination="org.freedesktop.ConsoleKit"
 
51
+           send_interface="org.freedesktop.ConsoleKit.Manager"
 
52
            send_member="CloseSession"/>
 
53
-    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
 
54
+    <allow send_destination="org.freedesktop.ConsoleKit"
 
55
+           send_interface="org.freedesktop.ConsoleKit.Manager"
 
56
            send_member="GetSeats"/>
 
57
-    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
 
58
+    <allow send_destination="org.freedesktop.ConsoleKit"
 
59
+           send_interface="org.freedesktop.ConsoleKit.Manager"
 
60
            send_member="GetSessionForCookie"/>
 
61
-    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
 
62
+    <allow send_destination="org.freedesktop.ConsoleKit"
 
63
+           send_interface="org.freedesktop.ConsoleKit.Manager"
 
64
            send_member="GetSessionForUnixProcess"/>
 
65
-    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
 
66
+    <allow send_destination="org.freedesktop.ConsoleKit"
 
67
+           send_interface="org.freedesktop.ConsoleKit.Manager"
 
68
            send_member="GetCurrentSession"/>
 
69
-    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
 
70
+    <allow send_destination="org.freedesktop.ConsoleKit"
 
71
+           send_interface="org.freedesktop.ConsoleKit.Manager"
 
72
            send_member="GetSessionsForUnixUser"/>
 
73
-    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
 
74
+    <allow send_destination="org.freedesktop.ConsoleKit"
 
75
+           send_interface="org.freedesktop.ConsoleKit.Manager"
 
76
            send_member="GetSessionsForUser"/>
 
77
-    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
 
78
+    <allow send_destination="org.freedesktop.ConsoleKit"
 
79
+           send_interface="org.freedesktop.ConsoleKit.Manager"
 
80
            send_member="GetSystemIdleHint"/>
 
81
-    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
 
82
+    <allow send_destination="org.freedesktop.ConsoleKit"
 
83
+           send_interface="org.freedesktop.ConsoleKit.Manager"
 
84
            send_member="GetSystemIdleSinceHint"/>
 
85
 
 
86
-    <allow send_interface="org.freedesktop.ConsoleKit.Seat"
 
87
+    <allow send_destination="org.freedesktop.ConsoleKit"
 
88
+           send_interface="org.freedesktop.ConsoleKit.Seat"
 
89
            send_member="GetId"/>
 
90
-    <allow send_interface="org.freedesktop.ConsoleKit.Seat"
 
91
+    <allow send_destination="org.freedesktop.ConsoleKit"
 
92
+           send_interface="org.freedesktop.ConsoleKit.Seat"
 
93
            send_member="GetSessions"/>
 
94
-    <allow send_interface="org.freedesktop.ConsoleKit.Seat"
 
95
+    <allow send_destination="org.freedesktop.ConsoleKit"
 
96
+           send_interface="org.freedesktop.ConsoleKit.Seat"
 
97
            send_member="GetDevices"/>
 
98
-    <allow send_interface="org.freedesktop.ConsoleKit.Seat"
 
99
+    <allow send_destination="org.freedesktop.ConsoleKit"
 
100
+           send_interface="org.freedesktop.ConsoleKit.Seat"
 
101
            send_member="GetActiveSession"/>
 
102
-    <allow send_interface="org.freedesktop.ConsoleKit.Seat"
 
103
+    <allow send_destination="org.freedesktop.ConsoleKit"
 
104
+           send_interface="org.freedesktop.ConsoleKit.Seat"
 
105
            send_member="CanActivateSessions"/>
 
106
-    <allow send_interface="org.freedesktop.ConsoleKit.Seat"
 
107
+    <allow send_destination="org.freedesktop.ConsoleKit"
 
108
+           send_interface="org.freedesktop.ConsoleKit.Seat"
 
109
            send_member="ActivateSession"/>
 
110
 
 
111
-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
 
112
+    <allow send_destination="org.freedesktop.ConsoleKit"
 
113
+           send_interface="org.freedesktop.ConsoleKit.Session"
 
114
            send_member="GetId"/>
 
115
-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
 
116
+    <allow send_destination="org.freedesktop.ConsoleKit"
 
117
+           send_interface="org.freedesktop.ConsoleKit.Session"
 
118
            send_member="GetSeatId"/>
 
119
-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
 
120
+    <allow send_destination="org.freedesktop.ConsoleKit"
 
121
+           send_interface="org.freedesktop.ConsoleKit.Session"
 
122
            send_member="GetLoginSessionId"/>
 
123
-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
 
124
+    <allow send_destination="org.freedesktop.ConsoleKit"
 
125
+           send_interface="org.freedesktop.ConsoleKit.Session"
 
126
            send_member="GetSessionType"/>
 
127
-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
 
128
+    <allow send_destination="org.freedesktop.ConsoleKit"
 
129
+           send_interface="org.freedesktop.ConsoleKit.Session"
 
130
            send_member="GetUser"/>
 
131
-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
 
132
+    <allow send_destination="org.freedesktop.ConsoleKit"
 
133
+           send_interface="org.freedesktop.ConsoleKit.Session"
 
134
            send_member="GetUnixUser"/>
 
135
-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
 
136
+    <allow send_destination="org.freedesktop.ConsoleKit"
 
137
+           send_interface="org.freedesktop.ConsoleKit.Session"
 
138
            send_member="GetX11Display"/>
 
139
-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
 
140
+    <allow send_destination="org.freedesktop.ConsoleKit"
 
141
+           send_interface="org.freedesktop.ConsoleKit.Session"
 
142
            send_member="GetX11DisplayDevice"/>
 
143
-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
 
144
+    <allow send_destination="org.freedesktop.ConsoleKit"
 
145
+           send_interface="org.freedesktop.ConsoleKit.Session"
 
146
            send_member="GetDisplayDevice"/>
 
147
-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
 
148
+    <allow send_destination="org.freedesktop.ConsoleKit"
 
149
+           send_interface="org.freedesktop.ConsoleKit.Session"
 
150
            send_member="GetRemoteHostName"/>
 
151
-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
 
152
+    <allow send_destination="org.freedesktop.ConsoleKit"
 
153
+           send_interface="org.freedesktop.ConsoleKit.Session"
 
154
            send_member="IsActive"/>
 
155
-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
 
156
+    <allow send_destination="org.freedesktop.ConsoleKit"
 
157
+           send_interface="org.freedesktop.ConsoleKit.Session"
 
158
            send_member="IsLocal"/>
 
159
-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
 
160
+    <allow send_destination="org.freedesktop.ConsoleKit"
 
161
+           send_interface="org.freedesktop.ConsoleKit.Session"
 
162
            send_member="GetCreationTime"/>
 
163
-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
 
164
+    <allow send_destination="org.freedesktop.ConsoleKit"
 
165
+           send_interface="org.freedesktop.ConsoleKit.Session"
 
166
            send_member="Activate"/>
 
167
-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
 
168
+    <allow send_destination="org.freedesktop.ConsoleKit"
 
169
+           send_interface="org.freedesktop.ConsoleKit.Session"
 
170
            send_member="GetIdleHint"/>
 
171
-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
 
172
+    <allow send_destination="org.freedesktop.ConsoleKit"
 
173
+           send_interface="org.freedesktop.ConsoleKit.Session"
 
174
+           send_member="SetIdleHint"/>
 
175
+    <allow send_destination="org.freedesktop.ConsoleKit"
 
176
+           send_interface="org.freedesktop.ConsoleKit.Session"
 
177
            send_member="GetIdleSinceHint"/>
 
178
   </policy>
 
179