diff options
author | Lennart Poettering <lennart@poettering.net> | 2013-07-10 23:33:17 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2013-07-10 23:41:03 +0200 |
commit | f2d4f98d5873e0649b79b04b967fc9625ab3a350 (patch) | |
tree | 4ebab662c956a1f7783f174260db5a6e07ee4370 /src | |
parent | 6797c324a653f119a3d7133122648aaa4878ddd6 (diff) |
logind: when creating the scope job fails, return this immediately to the client that wants to register the session
Otherwise we'll hanging for the job to finish without any job existing.
Similar, for machined.
Diffstat (limited to 'src')
-rw-r--r-- | src/login/logind-session.c | 1 | ||||
-rw-r--r-- | src/machine/machine.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/login/logind-session.c b/src/login/logind-session.c index 2892c38417..3c67f86b17 100644 --- a/src/login/logind-session.c +++ b/src/login/logind-session.c @@ -480,6 +480,7 @@ static int session_start_scope(Session *s) { dbus_error_free(&error); free(scope); + return r; } else { s->scope = scope; diff --git a/src/machine/machine.c b/src/machine/machine.c index d75c338189..591a656f1e 100644 --- a/src/machine/machine.c +++ b/src/machine/machine.c @@ -247,6 +247,7 @@ static int machine_start_scope(Machine *m) { dbus_error_free(&error); free(scope); + return r; } else { m->scope = scope; |