From a53082f07dd47c23d4c8fe4c8d1c63aadb10a4db Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 3 Jan 2024 04:03:25 +0900 Subject: [PATCH 1/2] resolve: do not listen to IPv6 when disabled by sysctl Fixes #30669. --- src/resolve/resolved-llmnr.c | 2 +- src/resolve/resolved-mdns.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/resolve/resolved-llmnr.c b/src/resolve/resolved-llmnr.c index 8fac351ee6..9469bdac86 100644 --- a/src/resolve/resolved-llmnr.c +++ b/src/resolve/resolved-llmnr.c @@ -45,7 +45,7 @@ int manager_llmnr_start(Manager *m) { if (r < 0) return r; - if (socket_ipv6_is_supported()) { + if (socket_ipv6_is_enabled()) { r = manager_llmnr_ipv6_udp_fd(m); if (r == -EADDRINUSE) goto eaddrinuse; diff --git a/src/resolve/resolved-mdns.c b/src/resolve/resolved-mdns.c index b63073af7f..3e6e83fe62 100644 --- a/src/resolve/resolved-mdns.c +++ b/src/resolve/resolved-mdns.c @@ -36,7 +36,7 @@ int manager_mdns_start(Manager *m) { if (r < 0) return r; - if (socket_ipv6_is_supported()) { + if (socket_ipv6_is_enabled()) { r = manager_mdns_ipv6_fd(m); if (r == -EADDRINUSE) goto eaddrinuse; From 6e6b59ed00332e4d8061b2f0f6bc0945d4fced64 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 3 Jan 2024 04:07:11 +0900 Subject: [PATCH 2/2] unit: order systemd-resolved after systemd-sysctl Otherwise, IPv6 enable/disable setting may be changed after resolved is started. --- units/systemd-resolved.service.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/units/systemd-resolved.service.in b/units/systemd-resolved.service.in index 736f36848c..820aecfef6 100644 --- a/units/systemd-resolved.service.in +++ b/units/systemd-resolved.service.in @@ -15,7 +15,7 @@ Documentation=https://www.freedesktop.org/wiki/Software/systemd/writing-network- Documentation=https://www.freedesktop.org/wiki/Software/systemd/writing-resolver-clients DefaultDependencies=no -After=systemd-sysusers.service +After=systemd-sysctl.service systemd-sysusers.service Before=sysinit.target network.target nss-lookup.target shutdown.target initrd-switch-root.target Conflicts=shutdown.target initrd-switch-root.target Wants=nss-lookup.target