From: Djalal Harouni <tixxdz@opendz.org>
Date: Sat, 8 Feb 2014 19:51:57 +0000 (+0100)
Subject: logind: use session_get_state() to get sessions state of the user
X-Git-Tag: v209~184
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=00555a2ee1b008bccbb570320047307b8b9159f9

logind: use session_get_state() to get sessions state of the user

In function user_get_state() remove the session_is_active() check, just
count on the session_get_state() function to get the correct session
state.

session_is_active() may return true before starting the session scope
and user service, this means it will return true even before the creation
of the session fifo_fd which will produce incorrect states.

So be consistent and just use session_get_state().
---

diff --git a/src/login/logind-user.c b/src/login/logind-user.c
index fdbf6e3aa..06fdbb36f 100644
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -648,9 +648,12 @@ UserState user_get_state(User *u) {
                 bool all_closing = true;
 
                 LIST_FOREACH(sessions_by_user, i, u->sessions) {
-                        if (session_is_active(i))
+                        SessionState state;
+
+                        state = session_get_state(i);
+                        if (state == SESSION_ACTIVE)
                                 return USER_ACTIVE;
-                        if (session_get_state(i) != SESSION_CLOSING)
+                        if (state != SESSION_CLOSING)
                                 all_closing = false;
                 }