summaryrefslogtreecommitdiff
path: root/src/login/logind-user.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-07-02 03:47:23 +0200
committerLennart Poettering <lennart@poettering.net>2013-07-02 03:47:23 +0200
commit1ee306e1248866617c96ed9f4263f375588ad838 (patch)
treeebcb5678d4236ea8a8afc30c6164a4b4f51a03bd /src/login/logind-user.c
parent374ec6abf31ada6ca554cc8ea99b282373fac010 (diff)
machined: split out machine registration stuff from logind
Embedded folks don't need the machine registration stuff, hence it's nice to make this optional. Also, I'd expect that machinectl will grow additional commands quickly, for example to join existing containers and suchlike, hence it's better keeping that separate from loginctl.
Diffstat (limited to 'src/login/logind-user.c')
-rw-r--r--src/login/logind-user.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/login/logind-user.c b/src/login/logind-user.c
index 316c4cd095..fb961bf64b 100644
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -354,11 +354,11 @@ static int user_start_slice(User *u) {
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(u->slice_job);
- u->slice_job = job;
-
return 0;
}
@@ -388,11 +388,11 @@ static int user_start_service(User *u) {
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(u->service_job);
- u->service_job = job;
-
return 0;
}