diff options
Diffstat (limited to 'avahi-daemon/main.c')
| -rw-r--r-- | avahi-daemon/main.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c index f32cbd6..a9dfb42 100644 --- a/avahi-daemon/main.c +++ b/avahi-daemon/main.c @@ -743,13 +743,12 @@ 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 && !config.use_chroot) < 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 |