chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
95ddf80
)
Prep v239: sync manager_get_user_by_pid() with upstream updates
author
Sven Eden
<yamakuzure@gmx.net>
Thu, 16 Aug 2018 06:07:55 +0000
(08:07 +0200)
committer
Sven Eden
<yamakuzure@gmx.net>
Fri, 24 Aug 2018 14:47:08 +0000
(16:47 +0200)
src/login/logind-core.c
patch
|
blob
|
history
diff --git
a/src/login/logind-core.c
b/src/login/logind-core.c
index fe4da328cee889790f6c41dc7b2598e8b30e8554..eecf20e9e83808bd41ca88f61feafba2ac211458 100644
(file)
--- 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) {