logind: after deserializatio readd systemd units to unit-to-object hashmap correctly

1 files changed, 33 insertions, 27 deletions

diff --git a/src/login/logind-user.c b/src/login/logind-user.c
index fb961bf64b..0a985a53ec 100644
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -338,27 +338,30 @@ static int user_start_slice(User *u) {
         dbus_error_init(&error);
 
         if (!u->slice) {
-                char lu[DECIMAL_STR_MAX(unsigned long) + 1];
+                char lu[DECIMAL_STR_MAX(unsigned long) + 1], *slice;
                 sprintf(lu, "%lu", (unsigned long) u->uid);
 
-                r = build_subslice(SPECIAL_USER_SLICE, lu, &u->slice);
+                r = build_subslice(SPECIAL_USER_SLICE, lu, &slice);
                 if (r < 0)
                         return r;
 
-                r = hashmap_put(u->manager->user_units, u->slice, u);
-                if (r < 0)
-                        log_warning("Failed to create mapping between unit and user");
-        }
+                r = manager_start_unit(u->manager, slice, &error, &job);
+                if (r < 0) {
+                        log_error("Failed to start user slice: %s", bus_error(&error, r));
+                        dbus_error_free(&error);
 
-        r = manager_start_unit(u->manager, u->slice, &error, &job);
-        if (r < 0) {
-                log_error("Failed to start user slice: %s", bus_error(&error, r));
-                dbus_error_free(&error);
-        } else {
-                free(u->slice_job);
-                u->slice_job = job;
+                        free(slice);
+                } else {
+                        u->slice = slice;
+
+                        free(u->slice_job);
+                        u->slice_job = job;
+                }
         }
 
+        if (u->slice)
+                hashmap_put(u->manager->user_units, u->slice, u);
+
         return 0;
 }
 
@@ -372,27 +375,30 @@ static int user_start_service(User *u) {
         dbus_error_init(&error);
 
         if (!u->service) {
-                char lu[DECIMAL_STR_MAX(unsigned long) + 1];
+                char lu[DECIMAL_STR_MAX(unsigned long) + 1], *service;
                 sprintf(lu, "%lu", (unsigned long) u->uid);
 
-                u->service = unit_name_build("user", lu, ".service");
-                if (!u->service)
+                service = unit_name_build("user", lu, ".service");
+                if (!service)
                         return log_oom();
 
-                r = hashmap_put(u->manager->user_units, u->service, u);
-                if (r < 0)
-                        log_warning("Failed to create mapping between service and user");
-        }
+                r = manager_start_unit(u->manager, service, &error, &job);
+                if (r < 0) {
+                        log_error("Failed to start user service: %s", bus_error(&error, r));
+                        dbus_error_free(&error);
 
-        r = manager_start_unit(u->manager, u->service, &error, &job);
-        if (r < 0) {
-                log_error("Failed to start user service: %s", bus_error(&error, r));
-                dbus_error_free(&error);
-        } else {
-                free(u->service_job);
-                u->service_job = job;
+                        free(service);
+                } else {
+                        u->service = service;
+
+                        free(u->service_job);
+                        u->service_job = job;
+                }
         }
 
+        if (u->service)
+                hashmap_put(u->manager->user_units, u->service, u);
+
         return 0;
 }