[systemd-commits] src/login

[Tom Gundersen]

 src/login/logind-user.c |    6 ------
 1 file changed, 6 deletions(-)

New commits:
commit 63966da86d8e71b1f3f2b57d5448770d526421f9
Author: Thomas Bächler <thomas at archlinux.org>
Date:   Sun Dec 15 12:06:37 2013 +0100

    login: Don't stop a running user manager from garbage-collecting the user.
    
    With the current logic, a user will never be garbage-collected, since its
    manager will always be around. Change the logic such that a user is
    garbage-collected when it has no sessions and linger is disabled.

diff --git a/src/login/logind-user.c b/src/login/logind-user.c
index 6ba8d98..441e086 100644
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -618,12 +618,6 @@ bool user_check_gc(User *u, bool drop_not_started) {
         if (u->service_job && manager_job_is_active(u->manager, u->service_job))
                 return true;
 
-        if (u->slice && manager_unit_is_active(u->manager, u->slice) != 0)
-                return true;
-
-        if (u->service && manager_unit_is_active(u->manager, u->service) != 0)
-                return true;
-
         return false;
 }