diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-02-13 16:48:03 -0500 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-02-13 16:48:03 -0500 |
| commit | 63408cb4f3607bc029f107e8bde46e60ecf627dc (patch) | |
| tree | 7f50eaba09fa0304f3069989652dde3464113c7c /src/resolve/resolved-dns-packet.h | |
| parent | 162149d6d99e1cdea695234c55bb027b010a7528 (diff) | |
| parent | 317f2fc9e71c39eb5b3c2269b25f7f977e61db34 (diff) | |
Merge pull request #2608 from poettering/resolved-prop-fix
bus property name fix in resolved
Diffstat (limited to 'src/resolve/resolved-dns-packet.h')
| -rw-r--r-- | src/resolve/resolved-dns-packet.h | 6 |
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; } |