From: Sven Eden <yamakuzure@gmx.net>
Date: Thu, 16 Aug 2018 06:07:55 +0000 (+0200)
Subject: Prep v239: sync manager_get_user_by_pid() with upstream updates
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=ae891c00cf40d39097656646966749265da6c5c9;p=elogind.git

Prep v239: sync manager_get_user_by_pid() with upstream updates
---

diff --git a/src/login/logind-core.c b/src/login/logind-core.c
index fe4da328c..eecf20e9e 100644
--- a/src/login/logind-core.c
+++ b/src/login/logind-core.c
@@ -384,6 +384,15 @@ int manager_get_user_by_pid(Manager *m, pid_t pid, User **ret) {
         if (ret)
                 *ret = u;
 
+#else
+        r = manager_get_session_by_pid (m, pid, &s);
+        if (r <= 0)
+                goto not_found;
+
+        if (ret)
+                *ret =  s->user;
+#endif // 0
+
         return 1;
 
 not_found:
@@ -391,15 +400,6 @@ not_found:
                 *ret = NULL;
 
         return 0;
-#else
-        r = manager_get_session_by_pid (m, pid, &s);
-        if (r <= 0)
-                return r;
-        if (ret)
-                *ret = u;
-
-        *user = s->user;
-#endif // 0
 }
 
 int manager_get_idle_hint(Manager *m, dual_timestamp *t) {