X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-daemon%2Fmain.c;h=0c85760f6b7932c1ac9bee92b8ec4cf791162a14;hb=cebb8af4a847631350541b27aa1343be3fc3443a;hp=da198686b6c289db6f605e494e9d4550133d88f5;hpb=f2af862d6619dba39ba056c9ffb5fc9c7e9fc59c;p=catta

diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c
index da19868..0c85760 100644
--- a/avahi-daemon/main.c
+++ b/avahi-daemon/main.c
@@ -66,6 +66,7 @@
 #include "main.h"
 #include "simple-protocol.h"
 #include "static-services.h"
+#include "static-hosts.h"
 #include "ini-file-parser.h"
 
 #ifdef HAVE_DBUS
@@ -75,6 +76,7 @@
 AvahiServer *avahi_server = NULL;
 AvahiSimplePoll *simple_poll_api = NULL;
 static char *argv0 = NULL;
+int nss_support = 0;
 
 typedef enum {
     DAEMON_RUN,
@@ -268,6 +270,7 @@ static void server_callback(AvahiServer *s, AvahiServerState state, void *userda
             avahi_set_proc_title("%s: running [%s]", argv0, avahi_server_get_host_name_fqdn(s));
             
             static_service_add_to_server();
+            static_hosts_add_to_server();
             
             remove_dns_server_entry_groups();
             
@@ -284,6 +287,7 @@ static void server_callback(AvahiServer *s, AvahiServerState state, void *userda
             char *n;
             
             static_service_remove_from_server();
+            static_hosts_remove_from_server();
             
             remove_dns_server_entry_groups();
             
@@ -483,6 +487,8 @@ static int load_config_file(DaemonConfig *c) {
                     c->server_config.use_ipv6 = is_yes(p->value);
                 else if (strcasecmp(p->key, "check-response-ttl") == 0)
                     c->server_config.check_response_ttl = is_yes(p->value);
+                else if (strcasecmp(p->key, "allow-point-to-point") == 0)
+                    c->server_config.allow_point_to_point = is_yes(p->value);
                 else if (strcasecmp(p->key, "use-iff-running") == 0)
                     c->server_config.use_iff_running = is_yes(p->value);
                 else if (strcasecmp(p->key, "disallow-other-stacks") == 0)
@@ -588,10 +594,12 @@ static int load_config_file(DaemonConfig *c) {
                 } else if (strcasecmp(p->key, "rlimit-stack") == 0) {
                     c->rlimit_stack_set = 1;
                     c->rlimit_stack = atoi(p->value);
-#ifdef RLIMIT_NPROC
                 } else if (strcasecmp(p->key, "rlimit-nproc") == 0) {
+#ifdef RLIMIT_NPROC
                     c->rlimit_nproc_set = 1;
                     c->rlimit_nproc = atoi(p->value);
+#else
+                    avahi_log_error("Ignoring configuration key \"%s\" in group \"%s\"\n", p->key, g->name);
 #endif
                 } else {
                     avahi_log_error("Invalid configuration key \"%s\" in group \"%s\"\n", p->key, g->name);
@@ -669,10 +677,13 @@ static void signal_callback(AvahiWatch *watch, AVAHI_GCC_UNUSED int fd, AVAHI_GC
             avahi_log_info("Got SIGHUP, reloading.");
 #ifdef ENABLE_CHROOT
             static_service_load(config.use_chroot);
+            static_hosts_load(config.use_chroot);
 #else
             static_service_load(0);
+            static_hosts_load(0);
 #endif            
             static_service_add_to_server();
+            static_service_remove_from_server();
 
             if (resolv_conf_entry_group)
                 avahi_s_entry_group_reset(resolv_conf_entry_group);
@@ -697,6 +708,8 @@ static void signal_callback(AvahiWatch *watch, AVAHI_GCC_UNUSED int fd, AVAHI_GC
     }
 }
 
+/* Imported from ../avahi-client/nss-check.c */
+int avahi_nss_support(void);
 
 static int run_server(DaemonConfig *c) {
     int r = -1;
@@ -707,6 +720,9 @@ static int run_server(DaemonConfig *c) {
 
     assert(c);
 
+    if (!(nss_support = avahi_nss_support()))
+        avahi_log_warn("WARNING: No NSS support for mDNS detected, consider installing nss-mdns!");
+
     if (!(simple_poll_api = avahi_simple_poll_new())) {
         avahi_log_error("Failed to create main loop object.");
         goto finish;
@@ -729,13 +745,16 @@ static int run_server(DaemonConfig *c) {
 
 #ifdef HAVE_DBUS
     if (c->enable_dbus) {
-        if (dbus_protocol_setup(poll_api, config.disable_user_service_publishing) < 0) {
+        if (dbus_protocol_setup(poll_api, config.disable_user_service_publishing, !c->fail_on_missing_dbus
+#ifdef ENABLE_CHROOT
+                                && !config.use_chroot
+#endif
+            ) < 0) {
+
+            avahi_log_warn("WARNING: Failed to contact D-BUS daemon.");
 
             if (c->fail_on_missing_dbus)
                 goto finish;
-
-            avahi_log_warn("WARNING: Failed to contact D-BUS daemon, disabling D-BUS support.");
-            c->enable_dbus = 0;
         }
     }
 #endif
@@ -763,8 +782,10 @@ static int run_server(DaemonConfig *c) {
     load_resolv_conf();
 #ifdef ENABLE_CHROOT
     static_service_load(config.use_chroot);
+    static_hosts_load(config.use_chroot);
 #else
     static_service_load(0);
+    static_hosts_load(0);
 #endif
 
     if (!(avahi_server = avahi_server_new(poll_api, &c->server_config, server_callback, c, &error))) {
@@ -798,6 +819,10 @@ finish:
     
     static_service_remove_from_server();
     static_service_free_all();
+
+    static_hosts_remove_from_server();
+    static_hosts_free_all();
+
     remove_dns_server_entry_groups();
     
     simple_protocol_shutdown();