don't publish the service cookie by default anymore. It was a bad idea. We should...

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

diff --git a/avahi-core/server.c b/avahi-core/server.c
index 61f488fde9d2d030647993de903e55714aa91b5b..00b5581a5767e68e6390ce42b976e6aa1ce44792 100644 (file)
--- a/avahi-core/server.c
+++ b/avahi-core/server.c
@@ -1563,7 +1563,7 @@ AvahiServerConfig* avahi_server_config_init(AvahiServerConfig *c) {
     c->use_iff_running = 0;
     c->enable_reflector = 0;
     c->reflect_ipv = 0;
-    c->add_service_cookie = 1;
+    c->add_service_cookie = 0;
     c->enable_wide_area = 0;
     c->n_wide_area_servers = 0;
     c->disallow_other_stacks = 0;

diff --git a/avahi-daemon/avahi-daemon.conf b/avahi-daemon/avahi-daemon.conf
index 21fa1667e0e8f54c7add0413b1d5f381b4525376..55392ae39a43ebe7fc788f4716fecb8b351485b2 100644 (file)
--- a/avahi-daemon/avahi-daemon.conf
+++ b/avahi-daemon/avahi-daemon.conf
@@ -38,7 +38,7 @@ enable-wide-area=yes
 [publish]
 #disable-publishing=no
 #disable-user-service-publishing=no
-#add-service-cookie=yes
+#add-service-cookie=no
 #publish-addresses=yes
 #publish-hinfo=yes
 #publish-workstation=yes

diff --git a/man/avahi-daemon.conf.5.xml.in b/man/avahi-daemon.conf.5.xml.in
index efd1a41a038e3a1c69172e0e6b8ce12e2fa6a927..8cc34505a5db4af5d65dd41d6475e1dda70d0be8 100644 (file)
--- a/man/avahi-daemon.conf.5.xml.in
+++ b/man/avahi-daemon.conf.5.xml.in
@@ -165,7 +165,7 @@
         which is chosen randomly on daemon startup. This can be used
         to detect if two services on two different
         interfaces/protocols are actually identical. Defaults to
-        "yes".</p>
+        "no".</p>
       </option>
 
       <option>