resolved: don't check conflicts for DNS-SD enumeration RRs
authorDmitry Rozhkov <dmitry.rozhkov@linux.intel.com>
Fri, 27 Oct 2017 09:16:54 +0000 (12:16 +0300)
committerDmitry Rozhkov <dmitry.rozhkov@linux.intel.com>
Fri, 8 Dec 2017 12:29:27 +0000 (14:29 +0200)
src/resolve/resolved-dns-zone.c

index 0ed7166..dcb9702 100644 (file)
@@ -619,6 +619,10 @@ int dns_zone_check_conflicts(DnsZone *zone, DnsResourceRecord *rr) {
         if (dns_zone_get(zone, rr))
                 return 0;
 
+        /* No conflict if it is DNS-SD RR used for service enumeration. */
+        if (dns_resource_key_is_dnssd_ptr(rr->key))
+                return 0;
+
         /* OK, somebody else has RRs for the same name. Yuck! Let's
          * start probing again */