summaryrefslogtreecommitdiff
path: root/src/login
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2016-03-06 16:56:33 +0100
committerAndy Wingo <wingo@pobox.com>2016-03-06 17:14:24 +0100
commitb5c5dd2ad43a3bf4fa0fb21139f8d16959b5d14e (patch)
treea3e33e62ff3ee9b47802e6ac300e50cc2e41c461 /src/login
parent162255186046fa7a5e82859b7dba5a7909ce6fc4 (diff)
Fixes to user and session saving
* src/login/logind-dbus.c (method_create_session): No need to save session here, as session_send_create_reply will do it. * src/login/logind-session-dbus.c (session_send_create_reply): On the other hand we do need to save the user here, so the file marks them as being active.
Diffstat (limited to 'src/login')
-rw-r--r--src/login/logind-dbus.c2
-rw-r--r--src/login/logind-session-dbus.c5
2 files changed, 3 insertions, 4 deletions
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 5e6952de05..6f7e5692aa 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -801,8 +801,6 @@ static int method_create_session(sd_bus *bus, sd_bus_message *message, void *use
if (r < 0)
goto fail;
- session_save(session);
-
return 1;
fail:
diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c
index f71798b208..337bbbbe8d 100644
--- a/src/login/logind-session-dbus.c
+++ b/src/login/logind-session-dbus.c
@@ -721,9 +721,10 @@ int session_send_create_reply(Session *s, sd_bus_error *error) {
if (fifo_fd < 0)
return fifo_fd;
- /* Update the session state file before we notify the client
- * about the result. */
+ /* Update the session and user state files before we notify
+ * the client about the result. */
session_save(s);
+ user_save(s->user);
p = session_bus_path(s);
if (!p)