X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fresolve%2Fresolved-dns-scope.c;h=abdb2e07325e2b4d80d81706dbb9f10c2aa28c0d;hb=32a568fb90bf0a22a3007fa670305403a5d0bb72;hp=1ce2bb4366a98bb0c14c76d2bdd943b8a79c1901;hpb=f647962d64e844689f3e2acfce6102fc47e76df2;p=elogind.git

diff --git a/src/resolve/resolved-dns-scope.c b/src/resolve/resolved-dns-scope.c
index 1ce2bb436..abdb2e073 100644
--- a/src/resolve/resolved-dns-scope.c
+++ b/src/resolve/resolved-dns-scope.c
@@ -334,7 +334,8 @@ DnsScopeMatch dns_scope_good_domain(DnsScope *s, int ifindex, uint64_t flags, co
         if (s->protocol == DNS_PROTOCOL_LLMNR) {
                 if (dns_name_endswith(domain, "in-addr.arpa") > 0 ||
                     dns_name_endswith(domain, "ip6.arpa") > 0 ||
-                    dns_name_single_label(domain) > 0)
+                    (dns_name_single_label(domain) > 0 &&
+                     dns_name_equal(domain, "gateway") <= 0))  /* don't resolve "gateway" with LLMNR, let nss-myhostname handle this */
                         return DNS_SCOPE_MAYBE;
 
                 return DNS_SCOPE_NO;
@@ -528,7 +529,7 @@ void dns_scope_process_query(DnsScope *s, DnsStream *stream, DnsPacket *p) {
         if (p->ipproto == IPPROTO_UDP) {
                 /* Don't accept UDP queries directed to anything but
                  * the LLMNR multicast addresses. See RFC 4795,
-                 * section 2.5.*/
+                 * section 2.5. */
 
                 if (p->family == AF_INET && !in_addr_equal(AF_INET, &p->destination, (union in_addr_union*) &LLMNR_MULTICAST_IPV4_ADDRESS))
                         return;