service: handle properly if a dbus process terminates before acquiring the dbus name

[elogind.git] / src / service.c

diff --git a/src/service.c b/src/service.c
index c276a9a27639155d5697a9cbf44246b5a4d2791c..8b1fab785ac364e287befcbe14bfda708c501d08 100644 (file)
--- a/src/service.c
+++ b/src/service.c
@@ -1963,14 +1963,18 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
                         break;
 
                 case SERVICE_START:
                         break;
 
                 case SERVICE_START:

-                        assert(s->type == SERVICE_FINISH);
+                        if (s->type == SERVICE_FINISH) {
+                                /* This was our main goal, so let's go on */
+                                if (success)
+                                        service_enter_start_post(s);
+                                else
+                                        service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);
+                                break;
+                        } else {
+                                assert(s->type == SERVICE_DBUS);

 
 

-                        /* This was our main goal, so let's go on */
-                        if (success)
-                                service_enter_start_post(s);
-                        else
-                                service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);
-                        break;
+                                /* Fall through */
+                        }

 
                 case SERVICE_RUNNING:
                         service_enter_running(s, success);
 
                 case SERVICE_RUNNING:
                         service_enter_running(s, success);