From: Trent Lloyd <lathiat@bur.st>
Date: Tue, 10 Jul 2007 23:52:30 +0000 (+0000)
Subject:  * Don't attempt to treat Known Answer records as potentially
X-Git-Url: https://git.meshlink.io/?a=commitdiff_plain;h=b6a614b20d4df2ef40c7213a6c448341f3e20ac5;p=catta

 * 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 00b5581..387156b 100644
--- 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);
         }