X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-daemon%2Fmain.c;h=566a276d599355d4b23324b142fc6e01ac1c0ce4;hb=a9566d5dcac080d7fa91546823277c57a5d09a5f;hp=c063d221733eba6a6b4fa2e2e97db6ce6b374eb0;hpb=b650dd11480e9cb6691e8e55974faa65b2eddcc8;p=catta

diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c
index c063d22..566a276 100644
--- a/avahi-daemon/main.c
+++ b/avahi-daemon/main.c
@@ -78,10 +78,8 @@ typedef struct {
     int daemonize;
     int use_syslog;
     char *config_file;
-#ifdef HAVE_DBUS
     int enable_dbus;
     int fail_on_missing_dbus;
-#endif
     int drop_root;
     int publish_resolv_conf;
     char ** publish_dns_servers;
@@ -222,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();
@@ -394,10 +392,6 @@ static int load_config_file(DaemonConfig *c) {
                     } else {
                         c->enable_dbus = 0;
                     }
-#ifdef HAVE_DBUS                
-                    if (c->enable_dbus == 1) 
-                        avahi_log_warning("Avahi was compiled without d-bus support but you requested it was enabled in the config file");
-#endif
                 }
                 else if (strcasecmp(p->key, "drop-root") == 0)
                     c->drop_root = is_yes(p->value);
@@ -601,9 +595,8 @@ 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) {
 
             if (c->fail_on_missing_dbus)
@@ -612,7 +605,11 @@ static int run_server(DaemonConfig *c) {
             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();
@@ -851,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;