]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
resolved: fix definition of SD_RESOLVED_FLAGS_MAKE
authorLennart Poettering <lennart@poettering.net>
Sat, 13 Feb 2016 19:02:30 +0000 (20:02 +0100)
committerLennart Poettering <lennart@poettering.net>
Sat, 13 Feb 2016 19:33:49 +0000 (20:33 +0100)
src/resolve/resolved-dns-packet.h

index 0bf34d270ce909798a9e1f1ed064a9173d636f73..416335d0a292ca86355b137a40d495df8c5a5957 100644 (file)
@@ -262,11 +262,9 @@ static inline uint64_t SD_RESOLVED_FLAGS_MAKE(DnsProtocol protocol, int family,
                 return f|(family == AF_INET6 ? SD_RESOLVED_LLMNR_IPV6 : SD_RESOLVED_LLMNR_IPV4);
 
         case DNS_PROTOCOL_MDNS:
-                return family == AF_INET6 ? SD_RESOLVED_MDNS_IPV6 : SD_RESOLVED_MDNS_IPV4;
+                return f|(family == AF_INET6 ? SD_RESOLVED_MDNS_IPV6 : SD_RESOLVED_MDNS_IPV4);
 
         default:
-                break;
+                return f;
         }
-
-        return 0;
 }