diff options
Diffstat (limited to 'src/login/logind-session-dbus.c')
| -rw-r--r-- | src/login/logind-session-dbus.c | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c index 8a95fc7c7..e7f64fd61 100644 --- a/src/login/logind-session-dbus.c +++ b/src/login/logind-session-dbus.c @@ -689,6 +689,17 @@ int session_send_lock_all(Manager *m, bool lock) { return r; } +#if 0 /// elogind does not support scope and service jobs +static bool session_ready(Session *s) { + assert(s); + + /* Returns true when the session is ready, i.e. all jobs we enqueued for it are done (regardless if successful or not) */ + + return !s->scope_job && + !s->user->service_job; +} +#endif // 0 + int session_send_create_reply(Session *s, sd_bus_error *error) { _cleanup_(sd_bus_message_unrefp) sd_bus_message *c = NULL; _cleanup_close_ int fifo_fd = -1; @@ -696,21 +707,18 @@ int session_send_create_reply(Session *s, sd_bus_error *error) { assert(s); - /* This is called after the session scope and the user service - * were successfully created, and finishes where + /* This is called after the session scope and the user service were successfully created, and finishes where * bus_manager_create_session() left off. */ if (!s->create_message) return 0; #if 0 /// elogind does not support scope and service jobs - if (!sd_bus_error_is_set(error) && (s->scope_job || s->user->service_job)) + if (!sd_bus_error_is_set(error) && !session_ready(s)) return 0; #endif // 0 - c = s->create_message; - s->create_message = NULL; - + c = TAKE_PTR(s->create_message); if (error) return sd_bus_reply_method_error(c, error); @@ -718,8 +726,7 @@ 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 state file before we notify the client about the result. */ session_save(s); #if 1 /// Additionally elogind saves the user state file |