* Bump so-names ready for 0.5

[catta] / avahi-daemon / main.c

diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c
index 9f7b8476267d34f211b107b327473925522ebe66..7f5d1484182a6f0d53b18e40622e85d58abb20bd 100644 (file)
--- 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. Local service cookie is %u.", avahi_server_get_host_name_fqdn(s), avahi_server_get_local_service_cookie(s));
         static_service_add_to_server();
 
         remove_dns_server_entry_groups();
@@ -394,9 +392,10 @@ static int load_config_file(DaemonConfig *c) {
                     } else {
                         c->enable_dbus = 0;
                     }
-                }
-                else if (strcasecmp(p->key, "drop-root") == 0)
+                } else if (strcasecmp(p->key, "drop-root") == 0)
                     c->drop_root = is_yes(p->value);
+                else if (strcasecmp(p->key, "add-service-cookie") == 0)
+                    c->server_config.add_service_cookie = is_yes(p->value);
                 else {
                     avahi_log_error("Invalid configuration key \"%s\" in group \"%s\"\n", p->key, g->name);
                     goto finish;
@@ -608,7 +607,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
     }
     
@@ -849,6 +849,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;