From 76e665855edef5b7103cb09d114377d477bfae02 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 26 Jul 2013 18:59:46 +0200
Subject: logind: update the session state file before we send out the
 CreateSession() reply

https://bugs.freedesktop.org/show_bug.cgi?id=67273
---
 src/login/logind-dbus.c         | 5 ++---
 src/login/logind-session-dbus.c | 4 ++++
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/login')

diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index b5e975a9f7..7b9bd201b2 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -2368,9 +2368,8 @@ DBusHandlerResult bus_message_filter(
                                                         dbus_set_error(&error, BUS_ERROR_JOB_FAILED, "Start job for unit %s failed with '%s'", unit, result);
                                                         session_send_create_reply(s, &error);
                                                 }
-                                        }
-
-                                        session_save(s);
+                                        } else
+                                                session_save(s);
                                 }
 
                                 session_add_to_gc_queue(s);
diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c
index 210f7564da..2cc4d8587b 100644
--- a/src/login/logind-session-dbus.c
+++ b/src/login/logind-session-dbus.c
@@ -592,6 +592,10 @@ int session_send_create_reply(Session *s, DBusError *error) {
                         return log_oom();
         }
 
+        /* Update the state file before we notify the client about the
+         * result */
+        session_save(s);
+
         if (!dbus_connection_send(s->manager->bus, reply, NULL))
                 return log_oom();
 
-- 
cgit v1.2.3-54-g00ecf