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=a31e7929b7f9599654de4a91f9ea258ba9cd463c;hpb=0a1beeb64207eaa88ab9236787b1cbc2f704ae14;p=elogind.git

diff --git a/src/resolve/resolved-dns-scope.c b/src/resolve/resolved-dns-scope.c
index a31e7929b..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;
@@ -539,7 +540,7 @@ void dns_scope_process_query(DnsScope *s, DnsStream *stream, DnsPacket *p) {
 
         r = dns_packet_extract(p);
         if (r < 0) {
-                log_debug_errno(-r, "Failed to extract resources from incoming packet: %m");
+                log_debug_errno(r, "Failed to extract resources from incoming packet: %m");
                 return;
         }
 
@@ -551,7 +552,7 @@ void dns_scope_process_query(DnsScope *s, DnsStream *stream, DnsPacket *p) {
 
         r = dns_zone_lookup(&s->zone, p->question, &answer, &soa, &tentative);
         if (r < 0) {
-                log_debug_errno(-r, "Failed to lookup key: %m");
+                log_debug_errno(r, "Failed to lookup key: %m");
                 return;
         }
         if (r == 0)
@@ -562,7 +563,7 @@ void dns_scope_process_query(DnsScope *s, DnsStream *stream, DnsPacket *p) {
 
         r = dns_scope_make_reply_packet(s, DNS_PACKET_ID(p), DNS_RCODE_SUCCESS, p->question, answer, soa, tentative, &reply);
         if (r < 0) {
-                log_debug_errno(-r, "Failed to build reply packet: %m");
+                log_debug_errno(r, "Failed to build reply packet: %m");
                 return;
         }
 
@@ -581,7 +582,7 @@ void dns_scope_process_query(DnsScope *s, DnsStream *stream, DnsPacket *p) {
                         return;
                 }
                 if (fd < 0) {
-                        log_debug_errno(-fd, "Failed to get reply socket: %m");
+                        log_debug_errno(fd, "Failed to get reply socket: %m");
                         return;
                 }
 
@@ -594,7 +595,7 @@ void dns_scope_process_query(DnsScope *s, DnsStream *stream, DnsPacket *p) {
         }
 
         if (r < 0) {
-                log_debug_errno(-r, "Failed to send reply packet: %m");
+                log_debug_errno(r, "Failed to send reply packet: %m");
                 return;
         }
 }
@@ -688,13 +689,13 @@ static int on_conflict_dispatch(sd_event_source *es, usec_t usec, void *userdata
 
                 r = dns_scope_make_conflict_packet(scope, rr, &p);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to make conflict packet: %m");
+                        log_error_errno(r, "Failed to make conflict packet: %m");
                         return 0;
                 }
 
                 r = dns_scope_emit(scope, p);
                 if (r < 0)
-                        log_debug_errno(-r, "Failed to send conflict packet: %m");
+                        log_debug_errno(r, "Failed to send conflict packet: %m");
         }
 
         return 0;
@@ -721,10 +722,8 @@ int dns_scope_notify_conflict(DnsScope *scope, DnsResourceRecord *rr) {
         r = ordered_hashmap_put(scope->conflict_queue, rr->key, rr);
         if (r == -EEXIST || r == 0)
                 return 0;
-        if (r < 0) {
-                log_debug_errno(-r, "Failed to queue conflicting RR: %m");
-                return r;
-        }
+        if (r < 0)
+                return log_debug_errno(r, "Failed to queue conflicting RR: %m");
 
         dns_resource_record_ref(rr);
 
@@ -740,10 +739,8 @@ int dns_scope_notify_conflict(DnsScope *scope, DnsResourceRecord *rr) {
                               now(clock_boottime_or_monotonic()) + jitter,
                               LLMNR_JITTER_INTERVAL_USEC,
                               on_conflict_dispatch, scope);
-        if (r < 0) {
-                log_debug_errno(-r, "Failed to add conflict dispatch event: %m");
-                return r;
-        }
+        if (r < 0)
+                return log_debug_errno(r, "Failed to add conflict dispatch event: %m");
 
         return 0;
 }
@@ -772,7 +769,7 @@ void dns_scope_check_conflicts(DnsScope *scope, DnsPacket *p) {
 
         r = dns_packet_extract(p);
         if (r < 0) {
-                log_debug_errno(-r, "Failed to extract packet: %m");
+                log_debug_errno(r, "Failed to extract packet: %m");
                 return;
         }