* Modify the local conflict detection to allow multiple identical

records, so it is consistent with the network conflict detection.  This
allows you to publish shared services from the same machine not just
different machines.

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

diff --git a/avahi-core/entry.c b/avahi-core/entry.c
index e2a7c6c270b84d719e10b1bff898b94937ebe852..55c9ea29d99804c3cdd972d0a4ce2206b1095950 100644 (file)
--- 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) &&