From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 13 Aug 2014 23:00:57 +0000 (+0200)
Subject: resolved: enable LLMNR
X-Git-Tag: v216~138
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=db97a66aa69925f7403ba3c433e86320d136567d;p=elogind.git

resolved: enable LLMNR

THis was accidentally broken, as we truned off LLMNR far to frequently,
where we only wanted to turn off LLMNr on IPV6 on kernels lacking
support for it.
---

diff --git a/src/resolve/resolved-link.c b/src/resolve/resolved-link.c
index fea52d94b..8ec180d3a 100644
--- a/src/resolve/resolved-link.c
+++ b/src/resolve/resolved-link.c
@@ -95,8 +95,7 @@ static void link_allocate_scopes(Link *l) {
 
         if (link_relevant(l, AF_INET) &&
             l->llmnr_support != SUPPORT_NO &&
-            l->manager->llmnr_support != SUPPORT_NO &&
-            l->manager->llmnr_ipv4_udp_fd >= 0) {
+            l->manager->llmnr_support != SUPPORT_NO) {
                 if (!l->llmnr_ipv4_scope) {
                         r = dns_scope_new(l->manager, &l->llmnr_ipv4_scope, l, DNS_PROTOCOL_LLMNR, AF_INET);
                         if (r < 0)
@@ -108,7 +107,7 @@ static void link_allocate_scopes(Link *l) {
         if (link_relevant(l, AF_INET6) &&
             l->llmnr_support != SUPPORT_NO &&
             l->manager->llmnr_support != SUPPORT_NO &&
-            l->manager->llmnr_ipv6_udp_fd >= 0) {
+            socket_ipv6_is_supported()) {
                 if (!l->llmnr_ipv6_scope) {
                         r = dns_scope_new(l->manager, &l->llmnr_ipv6_scope, l, DNS_PROTOCOL_LLMNR, AF_INET6);
                         if (r < 0)