Add an exit diagnostic, clean up a dbus flag

diff --git a/mdns_external.c b/mdns_external.c
index 684ab1e26c532efc202bb515e771e585895ca219..86ad208b663ce046f071430ee350e0eee24dde1a 100644 (file)
--- a/mdns_external.c
+++ b/mdns_external.c
@@ -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

diff --git a/shairport.c b/shairport.c
index e7c05f0fbf585f5af37b2c5148d5c42a8a8ec041..033bb98cc96b06fd968d4d05a49782207857466e 100644 (file)
--- a/shairport.c
+++ b/shairport.c
@@ -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");