|
 |
ac3a84 |
From fb589eae3231c6d968b116774097c90a64755f19 Mon Sep 17 00:00:00 2001
|
|
|
ac3a84 |
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
|
|
ac3a84 |
Date: Fri, 4 Nov 2022 12:53:07 +0900
|
|
|
ac3a84 |
Subject: [PATCH] resolve: drop redundant call of socket_ipv6_is_supported()
|
|
|
ac3a84 |
|
|
|
ac3a84 |
As link_relevant() is called with AF_INET6, which returns true only when
|
|
|
ac3a84 |
the link has at least one relevant IPv6 address.
|
|
|
ac3a84 |
|
|
|
ac3a84 |
(cherry picked from commit f6e4aa7b0370c8b39739e9d5dda780932489507a)
|
|
|
ac3a84 |
|
|
|
ac3a84 |
Related: #2138081
|
|
|
ac3a84 |
---
|
|
|
ac3a84 |
src/resolve/resolved-link.c | 3 +--
|
|
|
ac3a84 |
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
ac3a84 |
|
|
|
ac3a84 |
diff --git a/src/resolve/resolved-link.c b/src/resolve/resolved-link.c
|
|
|
ac3a84 |
index 9ab55eb82e..409d725686 100644
|
|
|
ac3a84 |
--- a/src/resolve/resolved-link.c
|
|
|
ac3a84 |
+++ b/src/resolve/resolved-link.c
|
|
|
ac3a84 |
@@ -152,8 +152,7 @@ void link_allocate_scopes(Link *l) {
|
|
|
ac3a84 |
|
|
|
ac3a84 |
if (link_relevant(l, AF_INET6, true) &&
|
|
|
ac3a84 |
l->llmnr_support != RESOLVE_SUPPORT_NO &&
|
|
|
ac3a84 |
- l->manager->llmnr_support != RESOLVE_SUPPORT_NO &&
|
|
|
ac3a84 |
- socket_ipv6_is_supported()) {
|
|
|
ac3a84 |
+ l->manager->llmnr_support != RESOLVE_SUPPORT_NO) {
|
|
|
ac3a84 |
if (!l->llmnr_ipv6_scope) {
|
|
|
ac3a84 |
r = dns_scope_new(l->manager, &l->llmnr_ipv6_scope, l, DNS_PROTOCOL_LLMNR, AF_INET6);
|
|
|
ac3a84 |
if (r < 0)
|