X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind-session.c;h=db22150825059f3411c09196205f43c54e434401;hb=d07f7b9ef2835c290d6beadebd17d15308608eea;hp=6e1bf6d560cfef49fe5a8bd499b4341a4974126b;hpb=374ec6abf31ada6ca554cc8ea99b282373fac010;p=elogind.git

diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index 6e1bf6d56..db2215082 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -455,9 +455,7 @@ done:
 }
 
 static int session_start_scope(Session *s) {
-        _cleanup_free_ char *description = NULL;
         DBusError error;
-        char *job;
         int r;
 
         assert(s);
@@ -467,26 +465,33 @@ static int session_start_scope(Session *s) {
         dbus_error_init(&error);
 
         if (!s->scope) {
-                s->scope = strjoin("session-", s->id, ".scope", NULL);
-                if (!s->scope)
+                _cleanup_free_ char *description = NULL;
+                char *scope, *job;
+
+                scope = strjoin("session-", s->id, ".scope", NULL);
+                if (!scope)
                         return log_oom();
 
-                r = hashmap_put(s->manager->session_units, s->scope, s);
-                if (r < 0)
-                        log_warning("Failed to create mapping between unit and session");
-        }
+                description = strjoin("Session ", s->id, " of user ", s->user->name, NULL);
 
-        description = strjoin("Session ", s->id, " of user ", s->user->name, NULL);
+                r = manager_start_scope(s->manager, scope, s->leader, s->user->slice, description, "systemd-user-sessions.service", &error, &job);
+                if (r < 0) {
+                        log_error("Failed to start session scope: %s %s", bus_error(&error, r), error.name);
+                        dbus_error_free(&error);
 
-        r = manager_start_scope(s->manager, s->scope, s->leader, s->user->slice, description, &error, &job);
-        if (r < 0) {
-                log_error("Failed to start session scope: %s %s", bus_error(&error, r), error.name);
-                dbus_error_free(&error);
-        } else {
-                free(s->scope_job);
-                s->scope_job = job;
+                        free(scope);
+                        return r;
+                } else {
+                        s->scope = scope;
+
+                        free(s->scope_job);
+                        s->scope_job = job;
+                }
         }
 
+        if (s->scope)
+                hashmap_put(s->manager->session_units, s->scope, s);
+
         return 0;
 }