From: Dmitry Rozhkov <dmitry.rozhkov@linux.intel.com>
Date: Fri, 27 Oct 2017 09:16:54 +0000 (+0300)
Subject: resolved: don't check conflicts for DNS-SD enumeration RRs
X-Git-Tag: v236~33^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d686f15c9efbef0d64c3ce7673f1a9ed0e9700ed;p=thirdparty%2Fsystemd.git

resolved: don't check conflicts for DNS-SD enumeration RRs
---

diff --git a/src/resolve/resolved-dns-zone.c b/src/resolve/resolved-dns-zone.c
index 0ed7166e012..dcb9702e577 100644
--- a/src/resolve/resolved-dns-zone.c
+++ b/src/resolve/resolved-dns-zone.c
@@ -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 */