logind: when creating the scope job fails, return this immediately to the client...

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 2892c38417f690fae404c5844076677ac8ce0fc2..3c67f86b17112a4f1c9646dcc64f07370a514a62 100644 (file)
--- 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);
                         dbus_error_free(&error);
 
                         free(scope);

+                        return r;

                 } else {
                         s->scope = scope;
 
                 } else {
                         s->scope = scope;
 

diff --git a/src/machine/machine.c b/src/machine/machine.c
index d75c3381890626268559d9831e4aede0fef33951..591a656f1ea192262dbb8ed57349ef4fe2307767 100644 (file)
--- 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);
                         dbus_error_free(&error);
 
                         free(scope);

+                        return r;

                 } else {
                         m->scope = scope;
 
                 } else {
                         m->scope = scope;