forked from pool/systemd
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
|
|
|