add new configuration file option "add-service-cookie"

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@556 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

diff --git a/avahi-daemon/avahi-daemon.conf b/avahi-daemon/avahi-daemon.conf
index 284a7fa7db38b495fdd2e2ea52f82f3d9a7683b5..6d88214288fc29fef3abb343559a684beda9180b 100644 (file)
--- a/avahi-daemon/avahi-daemon.conf
+++ b/avahi-daemon/avahi-daemon.conf
@@ -6,6 +6,7 @@ use-ipv6=no
 check-response-ttl=no
 use-iff-running=no
 enable-dbus=yes
+add-service-cookie=yes
 
 [publish]
 publish-addresses=yes

diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c
index dab65f7722ab13233e423e948e5740817663d2f6..7f5d1484182a6f0d53b18e40622e85d58abb20bd 100644 (file)
--- a/avahi-daemon/main.c
+++ b/avahi-daemon/main.c
@@ -392,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;