From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 4 Dec 2018 19:53:14 +0000 (+0100)
Subject: resolved: before assuming we have a server, check we are talking DNS and not LLMNR... 
X-Git-Tag: v240~111^2~5
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fsystemd.git;a=commitdiff_plain;h=199dda9c25e02ac69c9a751a1e7b837a747cb630

resolved: before assuming we have a server, check we are talking DNS and not LLMNR/mDNS
---

diff --git a/src/resolve/resolved-dns-transaction.c b/src/resolve/resolved-dns-transaction.c
index 4c0acf3a3fd..73e6306ba1d 100644
--- a/src/resolve/resolved-dns-transaction.c
+++ b/src/resolve/resolved-dns-transaction.c
@@ -628,7 +628,9 @@ static int dns_transaction_emit_tcp(DnsTransaction *t) {
                 fd = -1;
 
 #if ENABLE_DNS_OVER_TLS
-                if (DNS_SERVER_FEATURE_LEVEL_IS_TLS(t->current_feature_level)) {
+                if (t->scope->protocol == DNS_PROTOCOL_DNS &&
+                    DNS_SERVER_FEATURE_LEVEL_IS_TLS(t->current_feature_level)) {
+
                         assert(t->server);
                         r = dnstls_stream_connect_tls(s, t->server);
                         if (r < 0)