Add an exit diagnostic, clean up a dbus flag

This commit is contained in:
Mike Brady
2017-10-30 10:37:34 +01:00
parent 91c6587d78
commit 5fba88cd60
2 changed files with 2 additions and 4 deletions
+1 -1
View File
@@ -65,7 +65,7 @@ static int fork_execvp(const char *file, char *const argv[]) {
// If we reach this point then execve has failed.
// Write erno's value into the pipe and exit.
int ignore = write(execpipe[1], &errno, sizeof(errno));
debug(1,"execve has failed.");
_exit(-1);
return 0; // Just to make the compiler happy.
} else { // Parent
+1 -3
View File
@@ -1493,13 +1493,11 @@ int main(int argc, char **argv) {
metadata_init(); // create the metadata pipe if necessary
#endif
#if defined(HAVE_DBUS)
#ifdef HAVE_DBUS
// Start up DBUS services after initial settings are all made
debug(1, "Starting up D-Bus services");
pthread_create(&dbus_thread, NULL, &dbus_thread_func, NULL);
#ifdef HAVE_DBUS
start_dbus_service();
#endif
#endif
daemon_log(LOG_INFO, "Successful Startup");