X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fentry.c;h=55c9ea29d99804c3cdd972d0a4ce2206b1095950;hb=7686f1b38b13a660ac14b799c62f453fa012b4d7;hp=e2a7c6c270b84d719e10b1bff898b94937ebe852;hpb=116c6cd8c1738e7312cc84afd5e6d3a1b19b5d1f;p=catta

diff --git a/avahi-core/entry.c b/avahi-core/entry.c
index e2a7c6c..55c9ea2 100644
--- a/avahi-core/entry.c
+++ b/avahi-core/entry.c
@@ -161,6 +161,11 @@ static int check_record_conflict(AvahiServer *s, AvahiIfIndex interface, AvahiPr
         if ((flags & AVAHI_PUBLISH_ALLOW_MULTIPLE) && (e->flags & AVAHI_PUBLISH_ALLOW_MULTIPLE) )
             continue;
 
+        if (avahi_record_equal_no_ttl(r, e->record)) {
+            /* The records are the same, not a conflict in any case */
+            continue;
+        }
+
         if ((interface <= 0 ||
              e->interface <= 0 ||
              e->interface == interface) &&