summaryrefslogtreecommitdiffstats
path: root/src/resolve/resolved-dns-packet.h
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2016-02-13 20:02:30 +0100
committerLennart Poettering <lennart@poettering.net>2016-02-13 20:33:49 +0100
commit12e1893af312b515cc6a1496c673c22f42b53b7a (patch)
treece8b12aac6723eee45ce637e4e24ccbd8f2ecd57 /src/resolve/resolved-dns-packet.h
parentresolved: drop references to two bus error codes no longer used (diff)
downloadsystemd-12e1893af312b515cc6a1496c673c22f42b53b7a.tar.xz
systemd-12e1893af312b515cc6a1496c673c22f42b53b7a.zip
resolved: fix definition of SD_RESOLVED_FLAGS_MAKE
Diffstat (limited to 'src/resolve/resolved-dns-packet.h')
-rw-r--r--src/resolve/resolved-dns-packet.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/resolve/resolved-dns-packet.h b/src/resolve/resolved-dns-packet.h
index 0bf34d270c..416335d0a2 100644
--- a/src/resolve/resolved-dns-packet.h
+++ b/src/resolve/resolved-dns-packet.h
@@ -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;
}