forked from pool/systemd
74bf6f2e1d
- Add patch getty-generator-with-serial-3270-tty.patch to avoid harmless error messages on not existing getty@3270 files - Replace systemd-big-endian-reply-matching.patch with upstream 0001-sd-bus-don-t-look-for-a-64bit-value-when-we-only-hav.patch to solve broken systemd communication with and over dbus (bnc#866732) - Readd patch 1008-add-msft-compability-rules.patch for older code base as 13.1 - Modify pre_checkin.sh to throw an error if a patch will be applied which modifies one of Makefile.am, Makefile.in, or configiure.ac as this breaks bootstrapping - Add second version of make-209-working-on-older-dist.patch to be able to apply for bootstrapping version - Don't require non-existing binutils-gold - Avoid file conflict between udev and systemd (bnc#868230) - Modify patch module-load-handle-SUSE-etc-sysconfig-kernel-module-list.patch to ignore if /etc/sysconfig/kernel does not exist (bnc#865834) - Add patch systemd-big-endian-reply-matching.patch make sure that systemd can talk with dbus-daemon even on big endian systems (bnc#866732) ----------------------------------------------------------------- - Due to previous reason, resurrect systemd-dbus-system-bus-address.patch - Removed pkgconfig(dbus-1) BuildRequires - with 209 and newer, itis only needed for quering default DBus directories, which we nowpass to configure. OBS-URL: https://build.opensuse.org/request/show/225960 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=178
44 lines
1.7 KiB
Diff
44 lines
1.7 KiB
Diff
From 055d406624cb9e01963558767420b71e5f75d2d3 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
Date: Mon, 10 Mar 2014 08:25:15 -0400
|
|
Subject: [PATCH] logind: fix policykit checks
|
|
|
|
---
|
|
src/login/logind-dbus.c | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git src/login/logind-dbus.c src/login/logind-dbus.c
|
|
index c9c58f3..235b131 100644
|
|
--- src/login/logind-dbus.c
|
|
+++ src/login/logind-dbus.c
|
|
@@ -1480,6 +1480,8 @@ static int method_do_shutdown_or_sleep(
|
|
action_multiple_sessions, interactive, error, method, m);
|
|
if (r < 0)
|
|
return r;
|
|
+ if (r == 0)
|
|
+ return 1; /* No authorization for now, but the async polkit stuff will call us again when it has it */
|
|
}
|
|
|
|
if (blocked) {
|
|
@@ -1487,6 +1489,8 @@ static int method_do_shutdown_or_sleep(
|
|
action_ignore_inhibit, interactive, error, method, m);
|
|
if (r < 0)
|
|
return r;
|
|
+ if (r == 0)
|
|
+ return 1; /* No authorization for now, but the async polkit stuff will call us again when it has it */
|
|
}
|
|
|
|
if (!multiple_sessions && !blocked) {
|
|
@@ -1494,6 +1498,8 @@ static int method_do_shutdown_or_sleep(
|
|
action, interactive, error, method, m);
|
|
if (r < 0)
|
|
return r;
|
|
+ if (r == 0)
|
|
+ return 1; /* No authorization for now, but the async polkit stuff will call us again when it has it */
|
|
}
|
|
|
|
r = bus_manager_shutdown_or_sleep_now_or_later(m, unit_name, w, error);
|
|
--
|
|
1.7.9.2
|
|
|