If exec() returns in start_service (for example, if the command contains a typo and therefore doesn't exist), we cannot call exit() due to a bug in D-BUS. We will replace this with _exit() and also print out the nature of the error that caused exec() to return.

1 files changed, 10 insertions, 2 deletions

diff --git a/server/monitor.c b/server/monitor.c
index bddc0d488..18fb3255b 100644
--- a/server/monitor.c
+++ b/server/monitor.c
@@ -401,7 +401,7 @@ int monitor_process_init(TALLOC_CTX *mem_ctx,
         if (svc->command == NULL) {
             /* the LOCAL domain does not need a backend at the moment */
             if (strcasecmp(doms[i], "LOCAL") != 0) {
-                DEBUG(0, ("Missing command to run provider [%s]\n"));
+                DEBUG(0, ("Missing command to run provider\n"));
             }
             talloc_free(svc);
             continue;
@@ -884,7 +884,15 @@ static int start_service(const char *name, const char *command, pid_t *retpid)
 
     args = parse_args(command);
     execvp(args[0], args);
-    exit(1);
+
+    /* If we are here, exec() has failed
+     * Print errno and abort quickly */
+    DEBUG(0,("Could not exec %s, reason: %s\n", command, strerror(errno)));
+
+    /* We have to call _exit() instead of exit() here
+     * because a bug in D-BUS will cause the server to
+     * close its socket at exit() */
+    _exit(1);
 }
 
 int main(int argc, const char *argv[])