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;
#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();
} 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)
+ } 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;
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)
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();
#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;