s/Host/HostName/ in a couple places, and keep references to callbacks to

[catta] / avahi-daemon / main.c

diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c
index b5cc41e856c7e8f2c8662ca8ae6690ade067565b..566a276d599355d4b23324b142fc6e01ac1c0ce4 100644 (file)
--- a/avahi-daemon/main.c
+++ b/avahi-daemon/main.c
@@ -220,7 +220,7 @@ static void server_callback(AvahiServer *s, AvahiServerState state, void *userda
 #endif
 
     if (state == AVAHI_SERVER_RUNNING) {
-        avahi_log_info("Server startup complete.  Host name is <%s>", avahi_server_get_host_name_fqdn(s));
+        avahi_log_info("Server startup complete. Host name is %s.", avahi_server_get_host_name_fqdn(s));
         static_service_add_to_server();
 
         remove_dns_server_entry_groups();
@@ -606,7 +606,8 @@ static int run_server(DaemonConfig *c) {
             c->enable_dbus = 0;
         }
 #else
-        avahi_log_warn("WARNING: We are configured to enable D-BUS but it was not compiled in");
+        avahi_log_warn("WARNING: We are configured to enable D-BUS but it was not compiled in.");
+        c->enable_dbus = 0;
 #endif
     }
     
@@ -847,6 +848,9 @@ int main(int argc, char *argv[]) {
 #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;