1 diff -Nur avahi-0.1/avahi-daemon/avahi-daemon.conf avahi-0.1.new/avahi-daemon/avahi-daemon.conf
2 --- avahi-0.1/avahi-daemon/avahi-daemon.conf 2005-08-22 05:27:09.000000000 +0800
3 +++ avahi-0.1.new/avahi-daemon/avahi-daemon.conf 2005-08-23 04:46:04.000000000 +0800
13 diff -Nur avahi-0.1/avahi-daemon/main.c avahi-0.1.new/avahi-daemon/main.c
14 --- avahi-0.1/avahi-daemon/main.c 2005-08-22 05:27:09.000000000 +0800
15 +++ avahi-0.1.new/avahi-daemon/main.c 2005-08-23 04:45:45.000000000 +0800
22 + int fail_on_missing_dbus;
25 int publish_resolv_conf;
26 char ** publish_dns_servers;
28 c->server_config.check_response_ttl = is_yes(p->value);
29 else if (strcasecmp(p->key, "use-iff-running") == 0)
30 c->server_config.use_iff_running = is_yes(p->value);
31 - else if (strcasecmp(p->key, "enable-dbus") == 0)
32 - c->enable_dbus = is_yes(p->value);
34 + else if (strcasecmp(p->key, "enable-dbus") == 0) {
36 + if (*(p->value) == 'w' || *(p->value) == 'W') {
37 + c->fail_on_missing_dbus = 0;
39 + } else if (*(p->value) == 'y' || *(p->value) == 'Y') {
40 + c->fail_on_missing_dbus = 1;
47 else if (strcasecmp(p->key, "drop-root") == 0)
48 c->drop_root = is_yes(p->value);
54 - if (dbus_protocol_setup(poll_api) < 0)
56 + if (dbus_protocol_setup(poll_api) < 0) {
58 + if (c->fail_on_missing_dbus)
61 + avahi_log_warn("WARNING: Failed to contact D-BUS daemon, disabling D-BUS support.");
68 config.command = DAEMON_RUN;
70 config.config_file = NULL;
72 config.enable_dbus = 1;
73 + config.fail_on_missing_dbus = 1;
76 config.publish_dns_servers = NULL;
77 config.publish_resolv_conf = 0;
78 diff -Nur avahi-0.1/man/avahi-daemon.conf.5.xml.in avahi-0.1.new/man/avahi-daemon.conf.5.xml.in
79 --- avahi-0.1/man/avahi-daemon.conf.5.xml.in 2005-08-22 05:27:10.000000000 +0800
80 +++ avahi-0.1.new/man/avahi-daemon.conf.5.xml.in 2005-08-23 04:45:45.000000000 +0800
85 - <p><opt>enable-dbus=</opt> Takes a boolean value ("yes" or
86 - "no"). If set to "yes" avahi-daemon connects to DBUS, to offer
87 - an object oriented client API. Only available if avahi has
88 - been compiled with <opt>--enable-dbus</opt> in which case it
89 - defaults to "yes".</p>
90 + <p><opt>enable-dbus=</opt> Takes either "yes", "no" or
91 + "warn". If set to "yes" avahi-daemon connects to D-BUS,
92 + offering an object oriented client API. It is only available
93 + if avahi has been compiled with <opt>--enable-dbus</opt> in
94 + which case it defaults to "yes". "warn" behaves like "yes",
95 + but the daemon starts up even when it fails to connect to a