]> xenbits.xen.org Git - xenclient/build.git/commitdiff
[package/polykit] Ignore ConsoleKit
authorThomas Horsten <thomas.horsten@citrix.com>
Mon, 28 Sep 2009 15:55:40 +0000 (16:55 +0100)
committerThomas Horsten <thomas.horsten@citrix.com>
Mon, 28 Sep 2009 17:32:48 +0000 (18:32 +0100)
When PolicyKit enquires about a connection it tries to use ConsoleKit.
If the user is not a member of a CK session it is fine, but if it can't
connect to ConsoleKit at all it throws an error. This prevents
NetworkManager applet from editing global connections.

This patch causes ConsoleKit (which we don't have installed) to be
completely ignored.
(cherry picked from commit 9b02a4c3da826e293b54ce4d931455e078be1558)

package/polykit/polykit-ignore-consolekit.patch [new file with mode: 0644]

diff --git a/package/polykit/polykit-ignore-consolekit.patch b/package/polykit/polykit-ignore-consolekit.patch
new file mode 100644 (file)
index 0000000..a71f3fb
--- /dev/null
@@ -0,0 +1,20 @@
+diff --git a/src/polkit-dbus/polkit-dbus.c b/src/polkit-dbus/polkit-dbus.c
+index f7be03f..fa18777 100644
+--- a/src/polkit-dbus/polkit-dbus.c
++++ b/src/polkit-dbus/polkit-dbus.c
+@@ -464,6 +464,7 @@ polkit_caller_new_from_dbus_name (DBusConnection *con, const char *dbus_name, DB
+                 dbus_message_unref (reply);
+         }
++#if 0
+       message = dbus_message_new_method_call ("org.freedesktop.ConsoleKit", 
+                                               "/org/freedesktop/ConsoleKit/Manager",
+                                               "org.freedesktop.ConsoleKit.Manager",
+@@ -497,6 +498,7 @@ polkit_caller_new_from_dbus_name (DBusConnection *con, const char *dbus_name, DB
+                 session = NULL;
+                 goto out;
+         }
++#endif
+ not_in_session: