From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 2 Oct 2017 14:09:24 +0000 (+0200)
Subject: logind: don's change dry-run boolean before we actually enqueue the operation
X-Git-Tag: v235~18^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d13f5e164e3c2352d96dccc2ced4ca3af62cc9f1;p=thirdparty%2Fsystemd.git

logind: don's change dry-run boolean before we actually enqueue the operation

Let's not affect change before the PK check.
---

diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 61029580e2d..c6f184e0807 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -2037,6 +2037,7 @@ static int method_schedule_shutdown(sd_bus_message *message, void *userdata, sd_
         uint64_t elapse;
         char *type;
         int r;
+        bool dry_run = false;
 
         assert(m);
         assert(message);
@@ -2047,7 +2048,7 @@ static int method_schedule_shutdown(sd_bus_message *message, void *userdata, sd_
 
         if (startswith(type, "dry-")) {
                 type += 4;
-                m->shutdown_dry_run = true;
+                dry_run = true;
         }
 
         if (streq(type, "poweroff")) {
@@ -2091,6 +2092,8 @@ static int method_schedule_shutdown(sd_bus_message *message, void *userdata, sd_
                 return log_oom();
         }
 
+        m->shutdown_dry_run = dry_run;
+
         if (m->nologin_timeout_source) {
                 r = sd_event_source_set_time(m->nologin_timeout_source, elapse);
                 if (r < 0)