]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
resolved: also skip built-in trust anchor addition of there's a DNSKEY RR for the...
authorLennart Poettering <lennart@poettering.net>
Tue, 5 Jan 2016 13:19:05 +0000 (14:19 +0100)
committerLennart Poettering <lennart@poettering.net>
Tue, 5 Jan 2016 13:19:05 +0000 (14:19 +0100)
We already skip this when the trust anchor files define a DS RR for the
root domain, now also skip it if there's a DNSKEY RR.

src/resolve/resolved-dns-trust-anchor.c

index 432a8a64551baaf707f981a3d5a07d6b1c8ed047..53b49b091a1f36a785001dc50b8e81b162b6ce76 100644 (file)
@@ -56,6 +56,9 @@ static int dns_trust_anchor_add_builtin(DnsTrustAnchor *d) {
         if (hashmap_get(d->positive_by_key, &DNS_RESOURCE_KEY_CONST(DNS_CLASS_IN, DNS_TYPE_DS, ".")))
                 return 0;
 
+        if (hashmap_get(d->positive_by_key, &DNS_RESOURCE_KEY_CONST(DNS_CLASS_IN, DNS_TYPE_DNSKEY, ".")))
+                return 0;
+
         /* Add the RR from https://data.iana.org/root-anchors/root-anchors.xml */
         rr = dns_resource_record_new_full(DNS_CLASS_IN, DNS_TYPE_DS, "");
         if (!rr)