diff --git a/src/resolve/resolved-dns-question.c b/src/resolve/resolved-dns-question.c index 9288aa0af8..ddbb663b18 100644 --- a/src/resolve/resolved-dns-question.c +++ b/src/resolve/resolved-dns-question.c @@ -552,12 +552,3 @@ int dns_question_merge(DnsQuestion *a, DnsQuestion *b, DnsQuestion **ret) { *ret = TAKE_PTR(k); return 0; } - -bool dns_question_contains_key_type(DnsQuestion *q, uint16_t type) { - DnsResourceKey *t; - DNS_QUESTION_FOREACH(t, q) - if (t->type == type) - return true; - - return false; -} diff --git a/src/resolve/resolved-dns-question.h b/src/resolve/resolved-dns-question.h index 15ea3024ec..d4298a6031 100644 --- a/src/resolve/resolved-dns-question.h +++ b/src/resolve/resolved-dns-question.h @@ -57,8 +57,6 @@ static inline bool dns_question_isempty(DnsQuestion *q) { int dns_question_merge(DnsQuestion *a, DnsQuestion *b, DnsQuestion **ret); -bool dns_question_contains_key_type(DnsQuestion *q, uint16_t type); - DEFINE_TRIVIAL_CLEANUP_FUNC(DnsQuestion*, dns_question_unref); #define _DNS_QUESTION_FOREACH(u, k, q) \ diff --git a/src/resolve/resolved-dns-scope.c b/src/resolve/resolved-dns-scope.c index 72b918b3cf..867158aa71 100644 --- a/src/resolve/resolved-dns-scope.c +++ b/src/resolve/resolved-dns-scope.c @@ -764,11 +764,6 @@ DnsScopeMatch dns_scope_good_domain( if (!dns_scope_get_dns_server(s)) return DNS_SCOPE_NO; - /* Route DS requests to the parent */ - const char *route_domain = domain; - if (dns_question_contains_key_type(question, DNS_TYPE_DS)) - (void) dns_name_parent(&route_domain); - /* Always honour search domains for routing queries, except if this scope lacks DNS servers. Note that * we return DNS_SCOPE_YES here, rather than just DNS_SCOPE_MAYBE, which means other wildcard scopes * won't be considered anymore. */ @@ -777,7 +772,7 @@ DnsScopeMatch dns_scope_good_domain( if (!d->route_only && !dns_name_is_root(d->name)) has_search_domains = true; - if (dns_name_endswith(route_domain, d->name) > 0) { + if (dns_name_endswith(domain, d->name) > 0) { int c; c = dns_name_count_labels(d->name);