From: Sven Eden <yamakuzure@gmx.net>
Date: Thu, 16 Feb 2017 07:16:57 +0000 (+0100)
Subject: Allow NULL session parameter for manager_get_session_by_pid()
X-Git-Tag: v226.4~1^2~23
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=91216a607d510872fe02f82c84558417f26e60c3

Allow NULL session parameter for manager_get_session_by_pid()

The reason is, that method_create_session() calls that function to
detect whether there is already a running session.
---

diff --git a/src/login/logind-core.c b/src/login/logind-core.c
index 277e26255..06ca3c1c8 100644
--- a/src/login/logind-core.c
+++ b/src/login/logind-core.c
@@ -284,7 +284,6 @@ int manager_get_session_by_pid(Manager *m, pid_t pid, Session **session) {
         int r;
 
         assert(m);
-        assert(session);
 
         if (pid < 1)
                 return -EINVAL;
@@ -306,7 +305,8 @@ int manager_get_session_by_pid(Manager *m, pid_t pid, Session **session) {
         if (!s)
                 return 0;
 
-        *session = s;
+        if (session)
+                *session = s;
         return 1;
 }