* Don't attempt to treat Known Answer records as potentially

conflicting records.

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

diff --git a/avahi-core/server.c b/avahi-core/server.c
index 00b5581a5767e68e6390ce42b976e6aa1ce44792..387156b3cd238fa444dd5a0f2b8d6854af1a2fe9 100644 (file)
--- a/avahi-core/server.c
+++ b/avahi-core/server.c
@@ -610,11 +610,9 @@ static void handle_query_packet(AvahiServer *s, AvahiDnsPacket *p, AvahiInterfac
                 goto fail;
             }
             
-            if (handle_conflict(s, i, record, unique)) {
-                avahi_response_scheduler_suppress(i->response_scheduler, record, a);
-                avahi_record_list_drop(s->record_list, record);
-                avahi_cache_stop_poof(i->cache, record, a);
-            }
+            avahi_response_scheduler_suppress(i->response_scheduler, record, a);
+            avahi_record_list_drop(s->record_list, record);
+            avahi_cache_stop_poof(i->cache, record, a);
             
             avahi_record_unref(record);
         }