X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-daemon%2Fmain.c;h=75d01aabc25eb0ee7f1438c5cec7fab38b8fb777;hb=549a28cd15a86bd04e5bac765f2e26ef751b5cba;hp=2565f0240903bcd9d45acc44c182d6630b10aecd;hpb=fd44e62e0e8e0bf2b37a6a366683f0159d9e2b8a;p=catta

diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c
index 2565f02..75d01aa 100644
--- a/avahi-daemon/main.c
+++ b/avahi-daemon/main.c
@@ -47,6 +47,8 @@
 
 #include <avahi-common/malloc.h>
 #include <avahi-common/simple-watch.h>
+#include <avahi-common/error.h>
+#include <avahi-common/alternative.h>
 #include <avahi-core/core.h>
 #include <avahi-core/log.h>
 
@@ -77,6 +79,7 @@ typedef struct {
     int use_syslog;
     char *config_file;
     int enable_dbus;
+    int fail_on_missing_dbus;
     int drop_root;
     int publish_resolv_conf;
     char ** publish_dns_servers;
@@ -378,8 +381,18 @@ static int load_config_file(DaemonConfig *c) {
                     c->server_config.check_response_ttl = is_yes(p->value);
                 else if (strcasecmp(p->key, "use-iff-running") == 0)
                     c->server_config.use_iff_running = is_yes(p->value);
-                else if (strcasecmp(p->key, "enable-dbus") == 0)
-                    c->enable_dbus = is_yes(p->value);
+                else if (strcasecmp(p->key, "enable-dbus") == 0) {
+
+                    if (*(p->value) == 'w' || *(p->value) == 'W') {
+                        c->fail_on_missing_dbus = 0;
+                        c->enable_dbus = 1;
+                    } else if (*(p->value) == 'y' || *(p->value) == 'Y') {
+                        c->fail_on_missing_dbus = 1;
+                        c->enable_dbus = 1;
+                    } else {
+                        c->enable_dbus = 0;
+                    }
+                }
                 else if (strcasecmp(p->key, "drop-root") == 0)
                     c->drop_root = is_yes(p->value);
                 else {
@@ -582,12 +595,21 @@ static int run_server(DaemonConfig *c) {
 
     if (simple_protocol_setup(poll_api) < 0)
         goto finish;
-    
+    if (c->enable_dbus) {
 #ifdef HAVE_DBUS
-    if (c->enable_dbus)
-        if (dbus_protocol_setup(poll_api) < 0)
-            goto finish;
+        if (dbus_protocol_setup(poll_api) < 0) {
+
+            if (c->fail_on_missing_dbus)
+                goto finish;
+
+            avahi_log_warn("WARNING: Failed to contact D-BUS daemon, disabling D-BUS support.");
+            c->enable_dbus = 0;
+        }
+#else
+        avahi_log_warn("WARNING: We are configured to enable D-BUS but it was not compiled in");
+        c->enable_dbus = 0;
 #endif
+    }
     
     load_resolv_conf(c);
     static_service_load();
@@ -823,7 +845,13 @@ int main(int argc, char *argv[]) {
     config.command = DAEMON_RUN;
     config.daemonize = 0;
     config.config_file = NULL;
+#ifdef HAVE_DBUS
     config.enable_dbus = 1;
+    config.fail_on_missing_dbus = 1;
+#else
+    config.enable_dbus = 0;
+    config.fail_on_missing_dbus = 0;
+#endif
     config.drop_root = 1;
     config.publish_dns_servers = NULL;
     config.publish_resolv_conf = 0;