summaryrefslogtreecommitdiff
path: root/gnome-unstable/polkit
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-10-01 10:50:46 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-10-01 10:50:46 -0300
commit3aff11a8581ae7e5a8ccea02062cd92f873c44c5 (patch)
tree05623159a5ae88f6eed2414db216bc9a0d2d71c5 /gnome-unstable/polkit
parentd4157e6db6dd7e03802aa9c361a1902e81c2545a (diff)
parent9b6be78b0c13a61c14d5278f1363eaf9c6388e4c (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/geany/PKGBUILD community/linux-tools/PKGBUILD community/linux-tools/cpupower.conf community/linux-tools/cpupower.rc community/stk/PKGBUILD core/patch/PKGBUILD core/systemd/PKGBUILD extra/lftp/PKGBUILD extra/lftp/lftp-4.3.8-gets.patch extra/mysql/PKGBUILD extra/qt/PKGBUILD extra/transmission/PKGBUILD gnome-unstable/gcr/PKGBUILD gnome-unstable/glibmm/PKGBUILD gnome-unstable/gnome-session/PKGBUILD gnome-unstable/libgdata/PKGBUILD gnome-unstable/libgnome-keyring/PKGBUILD gnome-unstable/pango/PKGBUILD gnome-unstable/polkit/PKGBUILD gnome-unstable/telepathy-glib/PKGBUILD libre/linux-libre/PKGBUILD multilib/lib32-libphobos-ldc/PKGBUILD multilib/wine/PKGBUILD testing/dbus-core/PKGBUILD testing/dbus/PKGBUILD testing/libusbx/PKGBUILD testing/systemd/PKGBUILD testing/xf86-video-intel/PKGBUILD
Diffstat (limited to 'gnome-unstable/polkit')
-rw-r--r--gnome-unstable/polkit/fix-empty-wheel.patch47
1 files changed, 47 insertions, 0 deletions
diff --git a/gnome-unstable/polkit/fix-empty-wheel.patch b/gnome-unstable/polkit/fix-empty-wheel.patch
new file mode 100644
index 000000000..d6f99c43d
--- /dev/null
+++ b/gnome-unstable/polkit/fix-empty-wheel.patch
@@ -0,0 +1,47 @@
+From fa04223240d46641b0773dbf9f7d72f529046bea Mon Sep 17 00:00:00 2001
+From: David Zeuthen <zeuthen@gmail.com>
+Date: Tue, 18 Sep 2012 18:47:06 +0000
+Subject: Fall back to authenticating as uid 0 if the list of admin identities is empty
+
+For example, this can happen if the wheel group has no members. This
+was reported in Red Hat bug 834494, see
+
+ https://bugzilla.redhat.com/show_bug.cgi?id=834494
+
+Signed-off-by: David Zeuthen <zeuthen@gmail.com>
+---
+diff --git a/src/polkitbackend/polkitbackendinteractiveauthority.c b/src/polkitbackend/polkitbackendinteractiveauthority.c
+index 1d4a555..3bd2f0b 100644
+--- a/src/polkitbackend/polkitbackendinteractiveauthority.c
++++ b/src/polkitbackend/polkitbackendinteractiveauthority.c
+@@ -1293,15 +1293,11 @@ polkit_backend_interactive_authority_get_admin_identities (PolkitBackendInteract
+ PolkitDetails *details)
+ {
+ PolkitBackendInteractiveAuthorityClass *klass;
+- GList *ret;
++ GList *ret = NULL;
+
+ klass = POLKIT_BACKEND_INTERACTIVE_AUTHORITY_GET_CLASS (authority);
+
+- if (klass->get_admin_identities == NULL)
+- {
+- ret = g_list_prepend (NULL, polkit_unix_user_new (0));
+- }
+- else
++ if (klass->get_admin_identities != NULL)
+ {
+ ret = klass->get_admin_identities (authority,
+ caller,
+@@ -2257,6 +2253,10 @@ authentication_agent_initiate_challenge (AuthenticationAgent *agent,
+ }
+ }
+
++ /* Fall back to uid 0 if no users are available (rhbz #834494) */
++ if (user_identities == NULL)
++ user_identities = g_list_prepend (NULL, polkit_unix_user_new (0));
++
+ session = authentication_session_new (agent,
+ cookie,
+ subject,
+--
+cgit v0.9.0.2-2-gbebe