From d3f2e8c826b310b7b48e8394a3726c5bd0efc8ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Mon, 24 Feb 2014 21:50:36 -0500
Subject: [PATCH] Revert "login: Don't stop a running user manager from
 garbage-collecting the user."

This reverts commit f3656789f8c0d5255809b4057f609247d440ef79.

https://bugzilla.redhat.com/show_bug.cgi?id=1053315
---
 src/login/logind-user.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/login/logind-user.c b/src/login/logind-user.c
index b87311c0d7..ddf19eb0b6 100644
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -629,6 +629,12 @@ int user_check_gc(User *u, bool drop_not_started) {
         if (u->slice_job || u->service_job)
                 return 1;
 
+        if (u->slice && manager_unit_is_active(u->manager, u->slice) != 0)
+                return 1;
+
+        if (u->service && manager_unit_is_active(u->manager, u->service) != 0)
+                return 1;
+
         return 0;
 }