From: David Herrmann <dh.herrmann@gmail.com>
Date: Mon, 16 Nov 2015 14:45:02 +0000 (+0100)
Subject: login: ignore JobRemoved of old jobs
X-Git-Tag: v228.1~1^2~29
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=2bd94bfa67be6bc52fd525396fd87b4a6f323bed;ds=sidebyside

login: ignore JobRemoved of old jobs

If we requeue jobs, we are no longer interested in old jobs. Hence, we
better ignore any JobRemoved signals for old jobs and concentrate on our
replacements.
---

diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index b9296b5e5..d88636f74 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -2608,11 +2608,8 @@ int match_job_removed(sd_bus_message *message, void *userdata, sd_bus_error *err
         }
 
         session = hashmap_get(m->session_units, unit);
-        if (session) {
-
-                if (streq_ptr(path, session->scope_job))
-                        session->scope_job = mfree(session->scope_job);
-
+        if (session && streq_ptr(path, session->scope_job)) {
+                session->scope_job = mfree(session->scope_job);
                 session_jobs_reply(session, unit, result);
 
                 session_save(session);
@@ -2621,7 +2618,9 @@ int match_job_removed(sd_bus_message *message, void *userdata, sd_bus_error *err
         }
 
         user = hashmap_get(m->user_units, unit);
-        if (user) {
+        if (user &&
+            (streq_ptr(path, user->service_job) ||
+             streq_ptr(path, user->slice_job))) {
 
                 if (streq_ptr(path, user->service_job))
                         user->service_job = mfree(user->service_job);