add utf8 validity check API (based on the glib's implementation and hence mostly...

[catta] / avahi-daemon / main.c

diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c
index cd4a6dcf155480a01c9fe78283571b0b63bba7f1..82a1679a9e1b05daa4677d7921e36f0b4e6202e0 100644 (file)
--- a/avahi-daemon/main.c
+++ b/avahi-daemon/main.c
@@ -66,6 +66,7 @@
 #include "main.h"
 #include "simple-protocol.h"
 #include "static-services.h"
+#include "static-hosts.h"
 #include "ini-file-parser.h"
 
 #ifdef HAVE_DBUS
@@ -486,6 +487,8 @@ static int load_config_file(DaemonConfig *c) {
                     c->server_config.use_ipv6 = is_yes(p->value);
                 else if (strcasecmp(p->key, "check-response-ttl") == 0)
                     c->server_config.check_response_ttl = is_yes(p->value);
+                else if (strcasecmp(p->key, "allow-point-to-point") == 0)
+                    c->server_config.allow_point_to_point = 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, "disallow-other-stacks") == 0)
@@ -740,13 +743,16 @@ static int run_server(DaemonConfig *c) {
 
 #ifdef HAVE_DBUS
     if (c->enable_dbus) {
-        if (dbus_protocol_setup(poll_api, config.disable_user_service_publishing) < 0) {
+        if (dbus_protocol_setup(poll_api, config.disable_user_service_publishing, !c->fail_on_missing_dbus
+#ifdef ENABLE_CHROOT
+                                && !config.use_chroot
+#endif
+            ) < 0) {
+
+            avahi_log_warn("WARNING: Failed to contact D-BUS daemon.");
 
             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;
         }
     }
 #endif