diff options
author | Lennart Poettering <lennart@poettering.net> | 2013-07-02 17:17:35 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2013-07-02 17:18:41 +0200 |
commit | d0af76e68a5bab2e4fd9674b1c64a9f38d7afe97 (patch) | |
tree | a45e3254f7b2737fb24c142c4a41f5f0e98f0108 /src/login/logind-session.c | |
parent | 8b6fe8243d6a46d7435fb6789481489c44549cfb (diff) |
logind: after deserializatio readd systemd units to unit-to-object hashmap correctly
Diffstat (limited to 'src/login/logind-session.c')
-rw-r--r-- | src/login/logind-session.c | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/src/login/logind-session.c b/src/login/logind-session.c index 6e1bf6d560..2892c38417 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,32 @@ 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, &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); + } 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; } |