From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 10 Jul 2013 21:33:17 +0000 (+0200)
Subject: logind: when creating the scope job fails, return this immediately to the client... 
X-Git-Tag: v206~156
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=f2d4f98d5873e0649b79b04b967fc9625ab3a350;ds=sidebyside

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.
---

diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index 2892c3841..3c67f86b1 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 d75c33818..591a656f1 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;